Skip to content

Commit bb562a9

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

File tree

3,337 files changed

+42092
-24342
lines changed

Some content is hidden

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

3,337 files changed

+42092
-24342
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ modules.order
5555
/tags
5656
/TAGS
5757
/linux
58+
/modules-only.symvers
5859
/vmlinux
5960
/vmlinux.32
6061
/vmlinux.symvers

Documentation/ABI/testing/sysfs-devices-memory

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ Date: September 2008
2626
Contact: Badari Pulavarty <[email protected]>
2727
Description:
2828
The file /sys/devices/system/memory/memoryX/phys_device
29-
is read-only and is designed to show the name of physical
30-
memory device. Implementation is currently incomplete.
29+
is read-only; it is a legacy interface only ever used on s390x
30+
to expose the covered storage increment.
31+
Users: Legacy s390-tools lsmem/chmem
3132

3233
What: /sys/devices/system/memory/memoryX/phys_index
3334
Date: September 2008

Documentation/admin-guide/mm/memory-hotplug.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ Under each memory block, you can see 5 files:
160160

161161
"online_movable", "online", "offline" command
162162
which will be performed on all sections in the block.
163-
``phys_device`` read-only: designed to show the name of physical memory
164-
device. This is not well implemented now.
163+
``phys_device`` read-only: legacy interface only ever used on s390x to
164+
expose the covered storage increment.
165165
``removable`` read-only: contains an integer value indicating
166166
whether the memory block is removable or not
167167
removable. A value of 1 indicates that the memory

Documentation/admin-guide/perf/arm-cmn.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ PMU events
1717
----------
1818

1919
The PMU driver registers a single PMU device for the whole interconnect,
20-
see /sys/bus/event_source/devices/arm_cmn. Multi-chip systems may link
20+
see /sys/bus/event_source/devices/arm_cmn_0. Multi-chip systems may link
2121
more than one CMN together via external CCIX links - in this situation,
2222
each mesh counts its own events entirely independently, and additional
2323
PMU devices will be named arm_cmn_{1..n}.

Documentation/admin-guide/sysctl/vm.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -978,11 +978,11 @@ that benefit from having their data cached, zone_reclaim_mode should be
978978
left disabled as the caching effect is likely to be more important than
979979
data locality.
980980

981-
zone_reclaim may be enabled if it's known that the workload is partitioned
982-
such that each partition fits within a NUMA node and that accessing remote
983-
memory would cause a measurable performance reduction. The page allocator
984-
will then reclaim easily reusable pages (those page cache pages that are
985-
currently not used) before allocating off node pages.
981+
Consider enabling one or more zone_reclaim mode bits if it's known that the
982+
workload is partitioned such that each partition fits within a NUMA node
983+
and that accessing remote memory would cause a measurable performance
984+
reduction. The page allocator will take additional actions before
985+
allocating off node pages.
986986

987987
Allowing zone reclaim to write out pages stops processes that are
988988
writing large amounts of data from dirtying pages on other nodes. Zone

Documentation/arm/memory.rst

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,14 @@ fffe8000 fffeffff DTCM mapping area for platforms with
4545
fffe0000 fffe7fff ITCM mapping area for platforms with
4646
ITCM mounted inside the CPU.
4747

48-
ffc00000 ffefffff Fixmap mapping region. Addresses provided
48+
ffc80000 ffefffff Fixmap mapping region. Addresses provided
4949
by fix_to_virt() will be located here.
5050

51+
ffc00000 ffc7ffff Guard region
52+
53+
ff800000 ffbfffff Permanent, fixed read-only mapping of the
54+
firmware provided DT blob
55+
5156
fee00000 feffffff Mapping of PCI I/O space. This is a static
5257
mapping within the vmalloc space.
5358

Documentation/devicetree/bindings/media/renesas,vin.yaml

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -278,23 +278,35 @@ required:
278278
- interrupts
279279
- clocks
280280
- power-domains
281-
- resets
282-
283-
if:
284-
properties:
285-
compatible:
286-
contains:
287-
enum:
288-
- renesas,vin-r8a7778
289-
- renesas,vin-r8a7779
290-
- renesas,rcar-gen2-vin
291-
then:
292-
required:
293-
- port
294-
else:
295-
required:
296-
- renesas,id
297-
- ports
281+
282+
allOf:
283+
- if:
284+
not:
285+
properties:
286+
compatible:
287+
contains:
288+
enum:
289+
- renesas,vin-r8a7778
290+
- renesas,vin-r8a7779
291+
then:
292+
required:
293+
- resets
294+
295+
- if:
296+
properties:
297+
compatible:
298+
contains:
299+
enum:
300+
- renesas,vin-r8a7778
301+
- renesas,vin-r8a7779
302+
- renesas,rcar-gen2-vin
303+
then:
304+
required:
305+
- port
306+
else:
307+
required:
308+
- renesas,id
309+
- ports
298310

299311
additionalProperties: false
300312

Documentation/devicetree/bindings/net/btusb.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Following example uses irq pin number 3 of gpio0 for out of band wake-on-bt:
3838
compatible = "usb1286,204e";
3939
reg = <1>;
4040
interrupt-parent = <&gpio0>;
41-
interrupt-name = "wakeup";
41+
interrupt-names = "wakeup";
4242
interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
4343
};
4444
};

Documentation/devicetree/bindings/net/ethernet-controller.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ properties:
4949
description:
5050
Reference to an nvmem node for the MAC address
5151

52-
nvmem-cells-names:
52+
nvmem-cell-names:
5353
const: mac-address
5454

5555
phy-connection-type:
@@ -206,6 +206,11 @@ properties:
206206
Indicates that full-duplex is used. When absent, half
207207
duplex is assumed.
208208

209+
pause:
210+
$ref: /schemas/types.yaml#definitions/flag
211+
description:
212+
Indicates that pause should be enabled.
213+
209214
asym-pause:
210215
$ref: /schemas/types.yaml#definitions/flag
211216
description:

Documentation/devicetree/bindings/serial/8250.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,6 @@ properties:
9393
- mediatek,mt7622-btif
9494
- mediatek,mt7623-btif
9595
- const: mediatek,mtk-btif
96-
- items:
97-
- enum:
98-
- mediatek,mt7622-btif
99-
- mediatek,mt7623-btif
100-
- const: mediatek,mtk-btif
10196
- items:
10297
- const: mrvl,mmp-uart
10398
- const: intel,xscale-uart

0 commit comments

Comments
 (0)