Skip to content

Commit e445d06

Browse files
tyhickstyhicks
committed
Merge tag 'rolling-lts/wsl/5.10.60.1' into linux-msft-wsl-5.10.y
Signed-off-by: Tyler Hicks <[email protected]>
2 parents bb562a9 + f103fbe commit e445d06

File tree

2,085 files changed

+21130
-10038
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,085 files changed

+21130
-10038
lines changed

‎Documentation/ABI/testing/evm‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,30 @@ Description:
4949
modification of EVM-protected metadata and
5050
disable all further modification of policy
5151

52-
Note that once a key has been loaded, it will no longer be
53-
possible to enable metadata modification.
52+
Echoing a value is additive, the new value is added to the
53+
existing initialization flags.
54+
55+
For example, after::
56+
57+
echo 2 ><securityfs>/evm
58+
59+
another echo can be performed::
60+
61+
echo 1 ><securityfs>/evm
62+
63+
and the resulting value will be 3.
64+
65+
Note that once an HMAC key has been loaded, it will no longer
66+
be possible to enable metadata modification. Signaling that an
67+
HMAC key has been loaded will clear the corresponding flag.
68+
For example, if the current value is 6 (2 and 4 set)::
69+
70+
echo 1 ><securityfs>/evm
71+
72+
will set the new value to 3 (4 cleared).
73+
74+
Loading an HMAC key is the only way to disable metadata
75+
modification.
5476

5577
Until key loading has been signaled EVM can not create
5678
or validate the 'security.evm' xattr, but returns

‎Documentation/ABI/testing/sysfs-bus-papr-pmem‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,11 @@ KernelVersion: v5.9
3939
Contact: linuxppc-dev <[email protected]>, [email protected],
4040
Description:
4141
(RO) Report various performance stats related to papr-scm NVDIMM
42-
device. Each stat is reported on a new line with each line
43-
composed of a stat-identifier followed by it value. Below are
44-
currently known dimm performance stats which are reported:
42+
device. This attribute is only available for NVDIMM devices
43+
that support reporting NVDIMM performance stats. Each stat is
44+
reported on a new line with each line composed of a
45+
stat-identifier followed by it value. Below are currently known
46+
dimm performance stats which are reported:
4547

4648
* "CtlResCt" : Controller Reset Count
4749
* "CtlResTm" : Controller Reset Elapsed Time

‎Documentation/admin-guide/kernel-parameters.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,12 @@
577577
loops can be debugged more effectively on production
578578
systems.
579579

580+
clocksource.max_cswd_read_retries= [KNL]
581+
Number of clocksource_watchdog() retries due to
582+
external delays before the clock will be marked
583+
unstable. Defaults to three retries, that is,
584+
four attempts to read the clock under test.
585+
580586
clearcpuid=BITNUM[,BITNUM...] [X86]
581587
Disable CPUID feature X for the kernel. See
582588
arch/x86/include/asm/cpufeatures.h for the valid bit

‎Documentation/arm64/tagged-address-abi.rst‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,24 @@ how the user addresses are used by the kernel:
4545

4646
1. User addresses not accessed by the kernel but used for address space
4747
management (e.g. ``mprotect()``, ``madvise()``). The use of valid
48-
tagged pointers in this context is allowed with the exception of
49-
``brk()``, ``mmap()`` and the ``new_address`` argument to
50-
``mremap()`` as these have the potential to alias with existing
51-
user addresses.
52-
53-
NOTE: This behaviour changed in v5.6 and so some earlier kernels may
54-
incorrectly accept valid tagged pointers for the ``brk()``,
55-
``mmap()`` and ``mremap()`` system calls.
48+
tagged pointers in this context is allowed with these exceptions:
49+
50+
- ``brk()``, ``mmap()`` and the ``new_address`` argument to
51+
``mremap()`` as these have the potential to alias with existing
52+
user addresses.
53+
54+
NOTE: This behaviour changed in v5.6 and so some earlier kernels may
55+
incorrectly accept valid tagged pointers for the ``brk()``,
56+
``mmap()`` and ``mremap()`` system calls.
57+
58+
- The ``range.start``, ``start`` and ``dst`` arguments to the
59+
``UFFDIO_*`` ``ioctl()``s used on a file descriptor obtained from
60+
``userfaultfd()``, as fault addresses subsequently obtained by reading
61+
the file descriptor will be untagged, which may otherwise confuse
62+
tag-unaware programs.
63+
64+
NOTE: This behaviour changed in v5.14 and so some earlier kernels may
65+
incorrectly accept valid tagged pointers for this system call.
5666

5767
2. User addresses accessed by the kernel (e.g. ``write()``). This ABI
5868
relaxation is disabled by default and the application thread needs to

‎Documentation/devicetree/bindings/i2c/i2c-at91.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ i2c0: i2c@f8034600 {
7373
pinctrl-0 = <&pinctrl_i2c0>;
7474
pinctrl-1 = <&pinctrl_i2c0_gpio>;
7575
sda-gpios = <&pioA 30 GPIO_ACTIVE_HIGH>;
76-
scl-gpios = <&pioA 31 GPIO_ACTIVE_HIGH>;
76+
scl-gpios = <&pioA 31 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
7777

7878
wm8731: wm8731@1a {
7979
compatible = "wm8731";

‎Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ patternProperties:
5757
rate
5858
5959
sound-dai:
60-
$ref: /schemas/types.yaml#/definitions/phandle
60+
$ref: /schemas/types.yaml#/definitions/phandle-array
6161
description: phandle of the CPU DAI
6262

6363
patternProperties:
@@ -71,7 +71,7 @@ patternProperties:
7171
7272
properties:
7373
sound-dai:
74-
$ref: /schemas/types.yaml#/definitions/phandle
74+
$ref: /schemas/types.yaml#/definitions/phandle-array
7575
description: phandle of the codec DAI
7676

7777
required:

‎Documentation/driver-api/early-userspace/early_userspace_support.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,17 +69,17 @@ early userspace image can be built by an unprivileged user.
6969

7070
As a technical note, when directories and files are specified, the
7171
entire CONFIG_INITRAMFS_SOURCE is passed to
72-
usr/gen_initramfs_list.sh. This means that CONFIG_INITRAMFS_SOURCE
72+
usr/gen_initramfs.sh. This means that CONFIG_INITRAMFS_SOURCE
7373
can really be interpreted as any legal argument to
74-
gen_initramfs_list.sh. If a directory is specified as an argument then
74+
gen_initramfs.sh. If a directory is specified as an argument then
7575
the contents are scanned, uid/gid translation is performed, and
7676
usr/gen_init_cpio file directives are output. If a directory is
77-
specified as an argument to usr/gen_initramfs_list.sh then the
77+
specified as an argument to usr/gen_initramfs.sh then the
7878
contents of the file are simply copied to the output. All of the output
7979
directives from directory scanning and file contents copying are
8080
processed by usr/gen_init_cpio.
8181

82-
See also 'usr/gen_initramfs_list.sh -h'.
82+
See also 'usr/gen_initramfs.sh -h'.
8383

8484
Where's this all leading?
8585
=========================

‎Documentation/filesystems/f2fs.rst‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -688,10 +688,10 @@ users.
688688
===================== ======================== ===================
689689
User F2FS Block
690690
===================== ======================== ===================
691-
META WRITE_LIFE_NOT_SET
692-
HOT_NODE "
693-
WARM_NODE "
694-
COLD_NODE "
691+
N/A META WRITE_LIFE_NOT_SET
692+
N/A HOT_NODE "
693+
N/A WARM_NODE "
694+
N/A COLD_NODE "
695695
ioctl(COLD) COLD_DATA WRITE_LIFE_EXTREME
696696
extension list " "
697697

@@ -717,10 +717,10 @@ WRITE_LIFE_LONG " WRITE_LIFE_LONG
717717
===================== ======================== ===================
718718
User F2FS Block
719719
===================== ======================== ===================
720-
META WRITE_LIFE_MEDIUM;
721-
HOT_NODE WRITE_LIFE_NOT_SET
722-
WARM_NODE "
723-
COLD_NODE WRITE_LIFE_NONE
720+
N/A META WRITE_LIFE_MEDIUM;
721+
N/A HOT_NODE WRITE_LIFE_NOT_SET
722+
N/A WARM_NODE "
723+
N/A COLD_NODE WRITE_LIFE_NONE
724724
ioctl(COLD) COLD_DATA WRITE_LIFE_EXTREME
725725
extension list " "
726726

‎Documentation/filesystems/ramfs-rootfs-initramfs.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ Documentation/driver-api/early-userspace/early_userspace_support.rst for more de
170170
The kernel does not depend on external cpio tools. If you specify a
171171
directory instead of a configuration file, the kernel's build infrastructure
172172
creates a configuration file from that directory (usr/Makefile calls
173-
usr/gen_initramfs_list.sh), and proceeds to package up that directory
173+
usr/gen_initramfs.sh), and proceeds to package up that directory
174174
using the config file (by feeding it to usr/gen_init_cpio, which is created
175175
from usr/gen_init_cpio.c). The kernel's build-time cpio creation code is
176176
entirely self-contained, and the kernel's boot-time extractor is also

‎Documentation/hwmon/max31790.rst‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ Sysfs entries
3838
fan[1-12]_input RO fan tachometer speed in RPM
3939
fan[1-12]_fault RO fan experienced fault
4040
fan[1-6]_target RW desired fan speed in RPM
41-
pwm[1-6]_enable RW regulator mode, 0=disabled, 1=manual mode, 2=rpm mode
42-
pwm[1-6] RW fan target duty cycle (0-255)
41+
pwm[1-6]_enable RW regulator mode, 0=disabled (duty cycle=0%), 1=manual mode, 2=rpm mode
42+
pwm[1-6] RW read: current pwm duty cycle,
43+
write: target pwm duty cycle (0-255)
4344
================== === =======================================================

0 commit comments

Comments
 (0)