Skip to content

Commit 2d78eb0

Browse files
committed
Merge branch 'for-next' into for-linus
2 parents b47068b + ee0b089 commit 2d78eb0

File tree

2,072 files changed

+68637
-52362
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,072 files changed

+68637
-52362
lines changed

.mailmap

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ Christoph Hellwig <[email protected]>
104104
105105
Corey Minyard <[email protected]>
106106
Damian Hobson-Garcia <[email protected]>
107+
107108
108109
109110
@@ -353,7 +354,8 @@ Peter Oruba <[email protected]>
353354
354355
Praveen BP <[email protected]>
355356
356-
357+
358+
357359
358360
359361

CREDITS

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -918,6 +918,11 @@ S: Ottawa, Ontario
918918
S: K1N 6Z9
919919
S: CANADA
920920

921+
N: Vivien Didelot
922+
923+
D: DSA framework and MV88E6XXX driver
924+
S: Montreal, Quebec, Canada
925+
921926
N: Jeff Dike
922927
923928
W: http://user-mode-linux.sourceforge.net
@@ -2447,6 +2452,10 @@ S: 482 Shadowgraph Dr.
24472452
S: San Jose, CA 95110
24482453
S: USA
24492454

2455+
N: Michal Marek
2456+
2457+
D: Kbuild Maintainer 2009-2017
2458+
24502459
N: Martin Mares
24512460
24522461
W: http://www.ucw.cz/~mj/

Documentation/ABI/testing/sysfs-kernel-mm-memory-tiers

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Description: A collection of all the memory tiers allocated.
1010

1111

1212
What: /sys/devices/virtual/memory_tiering/memory_tierN/
13-
/sys/devices/virtual/memory_tiering/memory_tierN/nodes
13+
/sys/devices/virtual/memory_tiering/memory_tierN/nodelist
1414
Date: August 2022
1515
Contact: Linux memory management mailing list <[email protected]>
1616
Description: Directory with details of a specific memory tier
@@ -21,5 +21,5 @@ Description: Directory with details of a specific memory tier
2121
A smaller value of N implies a higher (faster) memory tier in the
2222
hierarchy.
2323

24-
nodes: NUMA nodes that are part of this memory tier.
24+
nodelist: NUMA nodes that are part of this memory tier.
2525

Documentation/admin-guide/acpi/index.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ the Linux ACPI support.
99
:maxdepth: 1
1010

1111
initrd_table_override
12-
dsdt-override
1312
ssdt-overlays
1413
cppc_sysfs
1514
fan_performance_states

Documentation/admin-guide/device-mapper/verity.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,10 @@ root_hash_sig_key_desc <key_description>
141141
also gain new certificates at run time if they are signed by a certificate
142142
already in the secondary trusted keyring.
143143

144+
try_verify_in_tasklet
145+
If verity hashes are in cache, verify data blocks in kernel tasklet instead
146+
of workqueue. This option can reduce IO latency.
147+
144148
Theory of operation
145149
===================
146150

Documentation/admin-guide/media/vivid.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1318,7 +1318,7 @@ instance. This setup would require the following commands:
13181318
$ v4l2-ctl -d2 -i2
13191319
$ v4l2-ctl -d2 -c horizontal_movement=4
13201320
$ v4l2-ctl -d1 --overlay=1
1321-
$ v4l2-ctl -d1 -c loop_video=1
1321+
$ v4l2-ctl -d0 -c loop_video=1
13221322
$ v4l2-ctl -d2 --stream-mmap --overlay=1
13231323
13241324
And from another console:

Documentation/arm64/booting.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,14 @@ Before jumping into the kernel, the following conditions must be met:
340340
- SMCR_EL2.LEN must be initialised to the same value for all CPUs the
341341
kernel will execute on.
342342

343+
- HWFGRTR_EL2.nTPIDR2_EL0 (bit 55) must be initialised to 0b01.
344+
345+
- HWFGWTR_EL2.nTPIDR2_EL0 (bit 55) must be initialised to 0b01.
346+
347+
- HWFGRTR_EL2.nSMPRI_EL1 (bit 54) must be initialised to 0b01.
348+
349+
- HWFGWTR_EL2.nSMPRI_EL1 (bit 54) must be initialised to 0b01.
350+
343351
For CPUs with the Scalable Matrix Extension FA64 feature (FEAT_SME_FA64)
344352

345353
- If EL3 is present:

Documentation/arm64/cpu-feature-registers.rst

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ operation if the source belongs to the supported system register space.
9292

9393
The infrastructure emulates only the following system register space::
9494

95-
Op0=3, Op1=0, CRn=0, CRm=0,4,5,6,7
95+
Op0=3, Op1=0, CRn=0, CRm=0,2,3,4,5,6,7
9696

9797
(See Table C5-6 'System instruction encodings for non-Debug System
9898
register accesses' in ARMv8 ARM DDI 0487A.h, for the list of
@@ -293,6 +293,42 @@ infrastructure:
293293
| WFXT | [3-0] | y |
294294
+------------------------------+---------+---------+
295295

296+
10) MVFR0_EL1 - AArch32 Media and VFP Feature Register 0
297+
298+
+------------------------------+---------+---------+
299+
| Name | bits | visible |
300+
+------------------------------+---------+---------+
301+
| FPDP | [11-8] | y |
302+
+------------------------------+---------+---------+
303+
304+
11) MVFR1_EL1 - AArch32 Media and VFP Feature Register 1
305+
306+
+------------------------------+---------+---------+
307+
| Name | bits | visible |
308+
+------------------------------+---------+---------+
309+
| SIMDFMAC | [31-28] | y |
310+
+------------------------------+---------+---------+
311+
| SIMDSP | [19-16] | y |
312+
+------------------------------+---------+---------+
313+
| SIMDInt | [15-12] | y |
314+
+------------------------------+---------+---------+
315+
| SIMDLS | [11-8] | y |
316+
+------------------------------+---------+---------+
317+
318+
12) ID_ISAR5_EL1 - AArch32 Instruction Set Attribute Register 5
319+
320+
+------------------------------+---------+---------+
321+
| Name | bits | visible |
322+
+------------------------------+---------+---------+
323+
| CRC32 | [19-16] | y |
324+
+------------------------------+---------+---------+
325+
| SHA2 | [15-12] | y |
326+
+------------------------------+---------+---------+
327+
| SHA1 | [11-8] | y |
328+
+------------------------------+---------+---------+
329+
| AES | [7-4] | y |
330+
+------------------------------+---------+---------+
331+
296332

297333
Appendix I: Example
298334
-------------------

Documentation/block/ublk.rst

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,42 @@ managing and controlling ublk devices with help of several control commands:
144144
For retrieving device info via ``ublksrv_ctrl_dev_info``. It is the server's
145145
responsibility to save IO target specific info in userspace.
146146

147+
- ``UBLK_CMD_START_USER_RECOVERY``
148+
149+
This command is valid if ``UBLK_F_USER_RECOVERY`` feature is enabled. This
150+
command is accepted after the old process has exited, ublk device is quiesced
151+
and ``/dev/ublkc*`` is released. User should send this command before he starts
152+
a new process which re-opens ``/dev/ublkc*``. When this command returns, the
153+
ublk device is ready for the new process.
154+
155+
- ``UBLK_CMD_END_USER_RECOVERY``
156+
157+
This command is valid if ``UBLK_F_USER_RECOVERY`` feature is enabled. This
158+
command is accepted after ublk device is quiesced and a new process has
159+
opened ``/dev/ublkc*`` and get all ublk queues be ready. When this command
160+
returns, ublk device is unquiesced and new I/O requests are passed to the
161+
new process.
162+
163+
- user recovery feature description
164+
165+
Two new features are added for user recovery: ``UBLK_F_USER_RECOVERY`` and
166+
``UBLK_F_USER_RECOVERY_REISSUE``.
167+
168+
With ``UBLK_F_USER_RECOVERY`` set, after one ubq_daemon(ublk server's io
169+
handler) is dying, ublk does not delete ``/dev/ublkb*`` during the whole
170+
recovery stage and ublk device ID is kept. It is ublk server's
171+
responsibility to recover the device context by its own knowledge.
172+
Requests which have not been issued to userspace are requeued. Requests
173+
which have been issued to userspace are aborted.
174+
175+
With ``UBLK_F_USER_RECOVERY_REISSUE`` set, after one ubq_daemon(ublk
176+
server's io handler) is dying, contrary to ``UBLK_F_USER_RECOVERY``,
177+
requests which have been issued to userspace are requeued and will be
178+
re-issued to the new process after handling ``UBLK_CMD_END_USER_RECOVERY``.
179+
``UBLK_F_USER_RECOVERY_REISSUE`` is designed for backends who tolerate
180+
double-write since the driver may issue the same I/O request twice. It
181+
might be useful to a read-only FS or a VM backend.
182+
147183
Data plane
148184
----------
149185

Documentation/core-api/kernel-api.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,12 @@ Text Searching
118118
CRC and Math Functions in Linux
119119
===============================
120120

121+
Arithmetic Overflow Checking
122+
----------------------------
123+
124+
.. kernel-doc:: include/linux/overflow.h
125+
:internal:
126+
121127
CRC Functions
122128
-------------
123129

0 commit comments

Comments
 (0)