Skip to content

Commit f15bfa1

Browse files
committed
Merge tag 'rolling-lts/wsl/6.18.26.1' into linux-msft-wsl-6.18.y
Linux rolling-lts/wsl/6.18.26.1 Signed-off-by: Mitchell Levy <levymitchell0@gmail.com>
2 parents 19a38cd + 5c22c9c commit f15bfa1

909 files changed

Lines changed: 10050 additions & 4260 deletions

File tree

Some content is hidden

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

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7925,6 +7925,9 @@
79257925
p = USB_QUIRK_SHORT_SET_ADDRESS_REQ_TIMEOUT
79267926
(Reduce timeout of the SET_ADDRESS
79277927
request from 5000 ms to 500 ms);
7928+
q = USB_QUIRK_FORCE_ONE_CONFIG (Device
7929+
claims zero configurations,
7930+
forcing to 1);
79287931
Example: quirks=0781:5580:bk,0a5c:5834:gij
79297932

79307933
usbhid.mousepoll=

Documentation/admin-guide/mm/damon/reclaim.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ of parametrs except ``enabled`` again. Once the re-reading is done, this
7171
parameter is set as ``N``. If invalid parameters are found while the
7272
re-reading, DAMON_RECLAIM will be disabled.
7373

74+
Once ``Y`` is written to this parameter, the user must not write to any
75+
parameters until reading ``commit_inputs`` again returns ``N``. If users
76+
violate this rule, the kernel may exhibit undefined behavior.
77+
7478
min_age
7579
-------
7680

Documentation/arch/arm64/silicon-errata.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,8 @@ stable kernels.
202202
+----------------+-----------------+-----------------+-----------------------------+
203203
| ARM | Neoverse-V3AE | #3312417 | ARM64_ERRATUM_3194386 |
204204
+----------------+-----------------+-----------------+-----------------------------+
205+
| ARM | C1-Pro | #4193714 | ARM64_ERRATUM_4193714 |
206+
+----------------+-----------------+-----------------+-----------------------------+
205207
| ARM | MMU-500 | #841119,826419 | ARM_SMMU_MMU_500_CPRE_ERRATA|
206208
| | | #562869,1047329 | |
207209
+----------------+-----------------+-----------------+-----------------------------+

Documentation/devicetree/bindings/auxdisplay/holtek,ht16k33.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ then:
6666
required:
6767
- refresh-rate-hz
6868

69-
additionalProperties: false
69+
unevaluatedProperties: false
7070

7171
examples:
7272
- |

Documentation/devicetree/bindings/connector/usb-connector.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,7 @@ properties:
301301
maxItems: 4
302302

303303
dependencies:
304+
pd-disable: [typec-power-opmode]
304305
sink-vdos-v1: [ sink-vdos ]
305306
sink-vdos: [ sink-vdos-v1 ]
306307

Documentation/devicetree/bindings/gpio/microchip,mpfs-gpio.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ properties:
3434
const: 2
3535

3636
"#interrupt-cells":
37-
const: 1
37+
const: 2
3838

3939
ngpios:
4040
description:
@@ -83,7 +83,7 @@ examples:
8383
gpio-controller;
8484
#gpio-cells = <2>;
8585
interrupt-controller;
86-
#interrupt-cells = <1>;
86+
#interrupt-cells = <2>;
8787
interrupts = <53>, <53>, <53>, <53>,
8888
<53>, <53>, <53>, <53>,
8989
<53>, <53>, <53>, <53>,

Documentation/devicetree/bindings/net/nvidia,tegra234-mgbe.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ properties:
4242
- const: mgbe
4343
- const: mac
4444
- const: mac-divider
45-
- const: ptp-ref
45+
- const: ptp_ref
4646
- const: rx-input-m
4747
- const: rx-input
4848
- const: tx
@@ -133,7 +133,7 @@ examples:
133133
<&bpmp TEGRA234_CLK_MGBE0_RX_PCS_M>,
134134
<&bpmp TEGRA234_CLK_MGBE0_RX_PCS>,
135135
<&bpmp TEGRA234_CLK_MGBE0_TX_PCS>;
136-
clock-names = "mgbe", "mac", "mac-divider", "ptp-ref", "rx-input-m",
136+
clock-names = "mgbe", "mac", "mac-divider", "ptp_ref", "rx-input-m",
137137
"rx-input", "tx", "eee-pcs", "rx-pcs-input", "rx-pcs-m",
138138
"rx-pcs", "tx-pcs";
139139
resets = <&bpmp TEGRA234_RESET_MGBE0_MAC>,

Documentation/devicetree/bindings/sound/st,stm32-sai.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ allOf:
164164
properties:
165165
compatible:
166166
contains:
167-
const: st,stm32mph7-sai
167+
const: st,stm32h7-sai
168168
then:
169169
properties:
170170
clocks:

Documentation/filesystems/overlayfs.rst

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -783,6 +783,56 @@ controlled by the "uuid" mount option, which supports these values:
783783
mounted with "uuid=on".
784784

785785

786+
Durability and copy up
787+
----------------------
788+
789+
The fsync(2) system call ensures that the data and metadata of a file
790+
are safely written to the backing storage, which is expected to
791+
guarantee the existence of the information post system crash.
792+
793+
Without an fsync(2) call, there is no guarantee that the observed
794+
data after a system crash will be either the old or the new data, but
795+
in practice, the observed data after crash is often the old or new data
796+
or a mix of both.
797+
798+
When an overlayfs file is modified for the first time, copy up will
799+
create a copy of the lower file and its parent directories in the upper
800+
layer. Since the Linux filesystem API does not enforce any particular
801+
ordering on storing changes without explicit fsync(2) calls, in case
802+
of a system crash, the upper file could end up with no data at all
803+
(i.e. zeros), which would be an unusual outcome. To avoid this
804+
experience, overlayfs calls fsync(2) on the upper file before completing
805+
data copy up with rename(2) or link(2) to make the copy up "atomic".
806+
807+
By default, overlayfs does not explicitly call fsync(2) on copied up
808+
directories or on metadata-only copy up, so it provides no guarantee to
809+
persist the user's modification unless the user calls fsync(2).
810+
The fsync during copy up only guarantees that if a copy up is observed
811+
after a crash, the observed data is not zeroes or intermediate values
812+
from the copy up staging area.
813+
814+
On traditional local filesystems with a single journal (e.g. ext4, xfs),
815+
fsync on a file also persists the parent directory changes, because they
816+
are usually modified in the same transaction, so metadata durability during
817+
data copy up effectively comes for free. Overlayfs further limits risk by
818+
disallowing network filesystems as upper layer.
819+
820+
Overlayfs can be tuned to prefer performance or durability when storing
821+
to the underlying upper layer. This is controlled by the "fsync" mount
822+
option, which supports these values:
823+
824+
- "auto": (default)
825+
Call fsync(2) on upper file before completion of data copy up.
826+
No explicit fsync(2) on directory or metadata-only copy up.
827+
- "strict":
828+
Call fsync(2) on upper file and directories before completion of any
829+
copy up.
830+
- "volatile": [*]
831+
Prefer performance over durability (see `Volatile mount`_)
832+
833+
[*] The mount option "volatile" is an alias to "fsync=volatile".
834+
835+
786836
Volatile mount
787837
--------------
788838

Documentation/hwmon/adm1177.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ for details.
2727
Sysfs entries
2828
-------------
2929

30-
The following attributes are supported. Current maxim attribute
30+
The following attributes are supported. Current maximum attribute
3131
is read-write, all other attributes are read-only.
3232

33-
in0_input Measured voltage in microvolts.
33+
in0_input Measured voltage in millivolts.
3434

35-
curr1_input Measured current in microamperes.
36-
curr1_max_alarm Overcurrent alarm in microamperes.
35+
curr1_input Measured current in milliamperes.
36+
curr1_max Overcurrent shutdown threshold in milliamperes.

0 commit comments

Comments
 (0)