Skip to content

Commit a571dc8

Browse files
committed
Merge tag 'rolling-lts/wsl/5.10.16.3' into linux-msft-wsl-5.10.y
Signed-off-by: Tyler Hicks <[email protected]>
2 parents 2c85ebc + a73aec0 commit a571dc8

File tree

1,818 files changed

+40524
-9061
lines changed

Some content is hidden

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

1,818 files changed

+40524
-9061
lines changed

Documentation/ABI/testing/sysfs-class-devlink

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ Description:
55
Provide a place in sysfs for the device link objects in the
66
kernel at any given time. The name of a device link directory,
77
denoted as ... above, is of the form <supplier>--<consumer>
8-
where <supplier> is the supplier device name and <consumer> is
9-
the consumer device name.
8+
where <supplier> is the supplier bus:device name and <consumer>
9+
is the consumer bus:device name.
1010

1111
What: /sys/class/devlink/.../auto_remove_on
1212
Date: May 2020

Documentation/ABI/testing/sysfs-devices-consumer

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ Contact: Saravana Kannan <[email protected]>
44
Description:
55
The /sys/devices/.../consumer:<consumer> are symlinks to device
66
links where this device is the supplier. <consumer> denotes the
7-
name of the consumer in that device link. There can be zero or
8-
more of these symlinks for a given device.
7+
name of the consumer in that device link and is of the form
8+
bus:device name. There can be zero or more of these symlinks
9+
for a given device.

Documentation/ABI/testing/sysfs-devices-supplier

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ Contact: Saravana Kannan <[email protected]>
44
Description:
55
The /sys/devices/.../supplier:<supplier> are symlinks to device
66
links where this device is the consumer. <supplier> denotes the
7-
name of the supplier in that device link. There can be zero or
8-
more of these symlinks for a given device.
7+
name of the supplier in that device link and is of the form
8+
bus:device name. There can be zero or more of these symlinks
9+
for a given device.

Documentation/admin-guide/device-mapper/dm-integrity.rst

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,14 +177,20 @@ bitmap_flush_interval:number
177177
The bitmap flush interval in milliseconds. The metadata buffers
178178
are synchronized when this interval expires.
179179

180+
allow_discards
181+
Allow block discard requests (a.k.a. TRIM) for the integrity device.
182+
Discards are only allowed to devices using internal hash.
183+
180184
fix_padding
181185
Use a smaller padding of the tag area that is more
182186
space-efficient. If this option is not present, large padding is
183187
used - that is for compatibility with older kernels.
184188

185-
allow_discards
186-
Allow block discard requests (a.k.a. TRIM) for the integrity device.
187-
Discards are only allowed to devices using internal hash.
189+
legacy_recalculate
190+
Allow recalculating of volumes with HMAC keys. This is disabled by
191+
default for security reasons - an attacker could modify the volume,
192+
set recalc_sector to zero, and the kernel would not detect the
193+
modification.
188194

189195
The journal mode (D/J), buffer_sectors, journal_watermark, commit_time and
190196
allow_discards can be changed when reloading the target (load an inactive

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5663,6 +5663,7 @@
56635663
device);
56645664
j = NO_REPORT_LUNS (don't use report luns
56655665
command, uas only);
5666+
k = NO_SAME (do not use WRITE_SAME, uas only)
56665667
l = NOT_LOCKABLE (don't try to lock and
56675668
unlock ejectable media, not on uas);
56685669
m = MAX_SECTORS_64 (don't transfer more
@@ -5964,6 +5965,10 @@
59645965
This option is obsoleted by the "nopv" option, which
59655966
has equivalent effect for XEN platform.
59665967

5968+
xen_no_vector_callback
5969+
[KNL,X86,XEN] Disable the vector callback for Xen
5970+
event channel interrupts.
5971+
59675972
xen_scrub_pages= [XEN]
59685973
Boolean option to control scrubbing pages before giving them back
59695974
to Xen, for use by other domains. Can be also changed at runtime

Documentation/asm-annotations.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,11 @@ Instruction Macros
100100
~~~~~~~~~~~~~~~~~~
101101
This section covers ``SYM_FUNC_*`` and ``SYM_CODE_*`` enumerated above.
102102

103+
``objtool`` requires that all code must be contained in an ELF symbol. Symbol
104+
names that have a ``.L`` prefix do not emit symbol table entries. ``.L``
105+
prefixed symbols can be used within a code region, but should be avoided for
106+
denoting a range of code via ``SYM_*_START/END`` annotations.
107+
103108
* ``SYM_FUNC_START`` and ``SYM_FUNC_START_LOCAL`` are supposed to be **the
104109
most frequent markings**. They are used for functions with standard calling
105110
conventions -- global and local. Like in C, they both align the functions to

Documentation/devicetree/bindings/display/bridge/sii902x.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ Optional properties:
88
- interrupts: describe the interrupt line used to inform the host
99
about hotplug events.
1010
- reset-gpios: OF device-tree gpio specification for RST_N pin.
11+
- iovcc-supply: I/O Supply Voltage (1.8V or 3.3V)
12+
- cvcc12-supply: Digital Core Supply Voltage (1.2V)
1113

1214
HDMI audio properties:
1315
- #sound-dai-cells: <0> or <1>. <0> if only i2s or spdif pin
@@ -54,6 +56,8 @@ Example:
5456
compatible = "sil,sii9022";
5557
reg = <0x39>;
5658
reset-gpios = <&pioA 1 0>;
59+
iovcc-supply = <&v3v3_hdmi>;
60+
cvcc12-supply = <&v1v2_hdmi>;
5761

5862
#sound-dai-cells = <0>;
5963
sil,i2s-data-lanes = < 0 1 2 >;

Documentation/devicetree/bindings/net/renesas,etheravb.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ allOf:
163163
enum:
164164
- renesas,etheravb-r8a774a1
165165
- renesas,etheravb-r8a774b1
166+
- renesas,etheravb-r8a774e1
166167
- renesas,etheravb-r8a7795
167168
- renesas,etheravb-r8a7796
168169
- renesas,etheravb-r8a77961

Documentation/devicetree/bindings/rtc/rtc.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,11 @@ properties:
6363
description:
6464
Enables wake up of host system on alarm.
6565

66+
reset-source:
67+
$ref: /schemas/types.yaml#/definitions/flag
68+
description:
69+
The RTC is able to reset the machine.
70+
6671
additionalProperties: true
6772

6873
...

Documentation/filesystems/overlayfs.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -575,6 +575,14 @@ without significant effort.
575575
The advantage of mounting with the "volatile" option is that all forms of
576576
sync calls to the upper filesystem are omitted.
577577

578+
In order to avoid a giving a false sense of safety, the syncfs (and fsync)
579+
semantics of volatile mounts are slightly different than that of the rest of
580+
VFS. If any writeback error occurs on the upperdir's filesystem after a
581+
volatile mount takes place, all sync functions will return an error. Once this
582+
condition is reached, the filesystem will not recover, and every subsequent sync
583+
call will return an error, even if the upperdir has not experience a new error
584+
since the last sync call.
585+
578586
When overlay is mounted with "volatile" option, the directory
579587
"$workdir/work/incompat/volatile" is created. During next mount, overlay
580588
checks for this directory and refuses to mount if present. This is a strong

0 commit comments

Comments
 (0)