Skip to content

Commit 1644d75

Browse files
committed
Merge branch 'linus'
2 parents b29e6ec + b6bb967 commit 1644d75

File tree

1,116 files changed

+24503
-14791
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,116 files changed

+24503
-14791
lines changed

CREDITS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,6 +1439,10 @@ N: Justin Guyett
14391439
14401440
D: via-rhine net driver hacking
14411441

1442+
N: Nitin Gupta
1443+
1444+
D: zsmalloc memory allocator and zram block device driver
1445+
14421446
N: Danny ter Haar
14431447
14441448
D: /proc/cpuinfo, reboot on panic , kernel pre-patch tester ;)

Documentation/ABI/stable/sysfs-driver-dma-idxd

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Date: Oct 25, 2019
2222
KernelVersion: 5.6.0
2323
2424
Description: The largest number of work descriptors in a batch.
25+
It's not visible when the device does not support batch.
2526

2627
What: /sys/bus/dsa/devices/dsa<m>/max_work_queues_size
2728
Date: Oct 25, 2019
@@ -49,6 +50,8 @@ Description: The total number of read buffers supported by this device.
4950
The read buffers represent resources within the DSA
5051
implementation, and these resources are allocated by engines to
5152
support operations. See DSA spec v1.2 9.2.4 Total Read Buffers.
53+
It's not visible when the device does not support Read Buffer
54+
allocation control.
5255

5356
What: /sys/bus/dsa/devices/dsa<m>/max_transfer_size
5457
Date: Oct 25, 2019
@@ -122,6 +125,8 @@ Contact: [email protected]
122125
Description: The maximum number of read buffers that may be in use at
123126
one time by operations that access low bandwidth memory in the
124127
device. See DSA spec v1.2 9.2.8 GENCFG on Global Read Buffer Limit.
128+
It's not visible when the device does not support Read Buffer
129+
allocation control.
125130

126131
What: /sys/bus/dsa/devices/dsa<m>/cmd_status
127132
Date: Aug 28, 2020
@@ -205,6 +210,7 @@ KernelVersion: 5.10.0
205210
206211
Description: The max batch size for this workqueue. Cannot exceed device
207212
max batch size. Configurable parameter.
213+
It's not visible when the device does not support batch.
208214

209215
What: /sys/bus/dsa/devices/wq<m>.<n>/ats_disable
210216
Date: Nov 13, 2020
@@ -250,6 +256,8 @@ KernelVersion: 5.17.0
250256
251257
Description: Enable the use of global read buffer limit for the group. See DSA
252258
spec v1.2 9.2.18 GRPCFG Use Global Read Buffer Limit.
259+
It's not visible when the device does not support Read Buffer
260+
allocation control.
253261

254262
What: /sys/bus/dsa/devices/group<m>.<n>/read_buffers_allowed
255263
Date: Dec 10, 2021
@@ -258,6 +266,8 @@ Contact: [email protected]
258266
Description: Indicates max number of read buffers that may be in use at one time
259267
by all engines in the group. See DSA spec v1.2 9.2.18 GRPCFG Read
260268
Buffers Allowed.
269+
It's not visible when the device does not support Read Buffer
270+
allocation control.
261271

262272
What: /sys/bus/dsa/devices/group<m>.<n>/read_buffers_reserved
263273
Date: Dec 10, 2021
@@ -266,6 +276,8 @@ Contact: [email protected]
266276
Description: Indicates the number of Read Buffers reserved for the use of
267277
engines in the group. See DSA spec v1.2 9.2.18 GRPCFG Read Buffers
268278
Reserved.
279+
It's not visible when the device does not support Read Buffer
280+
allocation control.
269281

270282
What: /sys/bus/dsa/devices/group<m>.<n>/desc_progress_limit
271283
Date: Sept 14, 2022

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1050,6 +1050,11 @@
10501050
them frequently to increase the rate of SLB faults
10511051
on kernel addresses.
10521052

1053+
stress_hpt [PPC]
1054+
Limits the number of kernel HPT entries in the hash
1055+
page table to increase the rate of hash page table
1056+
faults on kernel addresses.
1057+
10531058
disable= [IPV6]
10541059
See Documentation/networking/ipv6.rst.
10551060

@@ -2308,7 +2313,13 @@
23082313
Provide an override to the IOAPIC-ID<->DEVICE-ID
23092314
mapping provided in the IVRS ACPI table.
23102315
By default, PCI segment is 0, and can be omitted.
2311-
For example:
2316+
2317+
For example, to map IOAPIC-ID decimal 10 to
2318+
PCI segment 0x1 and PCI device 00:14.0,
2319+
write the parameter as:
2320+
ivrs_ioapic=10@0001:00:14.0
2321+
2322+
Deprecated formats:
23122323
* To map IOAPIC-ID decimal 10 to PCI device 00:14.0
23132324
write the parameter as:
23142325
ivrs_ioapic[10]=00:14.0
@@ -2320,7 +2331,13 @@
23202331
Provide an override to the HPET-ID<->DEVICE-ID
23212332
mapping provided in the IVRS ACPI table.
23222333
By default, PCI segment is 0, and can be omitted.
2323-
For example:
2334+
2335+
For example, to map HPET-ID decimal 10 to
2336+
PCI segment 0x1 and PCI device 00:14.0,
2337+
write the parameter as:
2338+
ivrs_hpet=10@0001:00:14.0
2339+
2340+
Deprecated formats:
23242341
* To map HPET-ID decimal 0 to PCI device 00:14.0
23252342
write the parameter as:
23262343
ivrs_hpet[0]=00:14.0
@@ -2331,15 +2348,20 @@
23312348
ivrs_acpihid [HW,X86-64]
23322349
Provide an override to the ACPI-HID:UID<->DEVICE-ID
23332350
mapping provided in the IVRS ACPI table.
2351+
By default, PCI segment is 0, and can be omitted.
23342352

23352353
For example, to map UART-HID:UID AMD0020:0 to
23362354
PCI segment 0x1 and PCI device ID 00:14.5,
23372355
write the parameter as:
2338-
ivrs_acpihid[0001:00:14.5]=AMD0020:0
2356+
ivrs_acpihid=AMD0020:0@0001:00:14.5
23392357

2340-
By default, PCI segment is 0, and can be omitted.
2341-
For example, PCI device 00:14.5 write the parameter as:
2358+
Deprecated formats:
2359+
* To map UART-HID:UID AMD0020:0 to PCI segment is 0,
2360+
PCI device ID 00:14.5, write the parameter as:
23422361
ivrs_acpihid[00:14.5]=AMD0020:0
2362+
* To map UART-HID:UID AMD0020:0 to PCI segment 0x1 and
2363+
PCI device ID 00:14.5, write the parameter as:
2364+
ivrs_acpihid[0001:00:14.5]=AMD0020:0
23432365

23442366
js= [HW,JOY] Analog joystick
23452367
See Documentation/input/joydev/joystick.rst.

Documentation/admin-guide/sysctl/kernel.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -436,8 +436,8 @@ ignore-unaligned-usertrap
436436

437437
On architectures where unaligned accesses cause traps, and where this
438438
feature is supported (``CONFIG_SYSCTL_ARCH_UNALIGN_NO_WARN``;
439-
currently, ``arc`` and ``ia64``), controls whether all unaligned traps
440-
are logged.
439+
currently, ``arc``, ``ia64`` and ``loongarch``), controls whether all
440+
unaligned traps are logged.
441441

442442
= =============================================================
443443
0 Log all unaligned accesses.
@@ -1492,8 +1492,8 @@ unaligned-trap
14921492

14931493
On architectures where unaligned accesses cause traps, and where this
14941494
feature is supported (``CONFIG_SYSCTL_ARCH_UNALIGN_ALLOW``; currently,
1495-
``arc`` and ``parisc``), controls whether unaligned traps are caught
1496-
and emulated (instead of failing).
1495+
``arc``, ``parisc`` and ``loongarch``), controls whether unaligned traps
1496+
are caught and emulated (instead of failing).
14971497

14981498
= ========================================================
14991499
0 Do not emulate unaligned accesses.

Documentation/devicetree/bindings/arm/bcm/bcm2835.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
$id: http://devicetree.org/schemas/arm/bcm/bcm2835.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: Broadcom BCM2711/BCM2835 Platforms Device Tree Bindings
7+
title: Broadcom BCM2711/BCM2835 Platforms
88

99
maintainers:
1010
- Eric Anholt <[email protected]>

Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
$id: http://devicetree.org/schemas/arm/bcm/brcm,bcm11351.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: Broadcom BCM11351 device tree bindings
7+
title: Broadcom BCM11351
88

99
maintainers:
1010
- Florian Fainelli <[email protected]>

Documentation/devicetree/bindings/arm/bcm/brcm,bcm21664.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
$id: http://devicetree.org/schemas/arm/bcm/brcm,bcm21664.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: Broadcom BCM21664 device tree bindings
7+
title: Broadcom BCM21664
88

99
maintainers:
1010
- Florian Fainelli <[email protected]>

Documentation/devicetree/bindings/arm/bcm/brcm,bcm23550.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
$id: http://devicetree.org/schemas/arm/bcm/brcm,bcm23550.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: Broadcom BCM23550 device tree bindings
7+
title: Broadcom BCM23550
88

99
maintainers:
1010
- Florian Fainelli <[email protected]>

Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
$id: http://devicetree.org/schemas/arm/bcm/brcm,bcm4708.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: Broadcom BCM4708 device tree bindings
7+
title: Broadcom BCM4708
88

99
description:
1010
Broadcom BCM4708/47081/4709/47094/53012 Wi-Fi/network SoCs based

Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
$id: http://devicetree.org/schemas/arm/bcm/brcm,bcmbca.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: Broadcom Broadband SoC device tree bindings
7+
title: Broadcom Broadband SoC
88

99
description:
1010
Broadcom Broadband SoCs include family of high performance DSL/PON/Wireless

0 commit comments

Comments
 (0)