Skip to content

Commit f4b369c

Browse files
committed
Merge branch 'next' into for-linus
Prepare input updates for 7.1 merge window.
2 parents ff14daf + 2ca45e5 commit f4b369c

25,517 files changed

Lines changed: 1358803 additions & 485487 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.

.clang-format

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ ForEachMacros:
140140
- 'damon_for_each_scheme_safe'
141141
- 'damon_for_each_target'
142142
- 'damon_for_each_target_safe'
143-
- 'damos_for_each_filter'
144-
- 'damos_for_each_filter_safe'
143+
- 'damos_for_each_core_filter'
144+
- 'damos_for_each_core_filter_safe'
145145
- 'damos_for_each_ops_filter'
146146
- 'damos_for_each_ops_filter_safe'
147147
- 'damos_for_each_quota_goal'
@@ -167,7 +167,7 @@ ForEachMacros:
167167
- 'drm_connector_for_each_possible_encoder'
168168
- 'drm_exec_for_each_locked_object'
169169
- 'drm_exec_for_each_locked_object_reverse'
170-
- 'drm_for_each_bridge_in_chain'
170+
- 'drm_for_each_bridge_in_chain_scoped'
171171
- 'drm_for_each_connector_iter'
172172
- 'drm_for_each_crtc'
173173
- 'drm_for_each_crtc_reverse'
@@ -259,6 +259,7 @@ ForEachMacros:
259259
- 'for_each_collection'
260260
- 'for_each_comp_order'
261261
- 'for_each_compatible_node'
262+
- 'for_each_compatible_node_scoped'
262263
- 'for_each_component_dais'
263264
- 'for_each_component_dais_safe'
264265
- 'for_each_conduit'
@@ -415,6 +416,7 @@ ForEachMacros:
415416
- 'for_each_prop_dlc_cpus'
416417
- 'for_each_prop_dlc_platforms'
417418
- 'for_each_property_of_node'
419+
- 'for_each_pt_level_entry'
418420
- 'for_each_rdt_resource'
419421
- 'for_each_reg'
420422
- 'for_each_reg_filtered'
@@ -747,6 +749,7 @@ ForEachMacros:
747749
- 'ynl_attr_for_each_nested'
748750
- 'ynl_attr_for_each_payload'
749751
- 'zorro_for_each_dev'
752+
- 'zpci_bus_for_each'
750753

751754
IncludeBlocks: Preserve
752755
IncludeCategories:

.editorconfig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22

3-
root = true
4-
5-
[{*.{awk,c,dts,dtsi,dtso,h,mk,s,S},Kconfig,Makefile,Makefile.*}]
3+
[{*.{awk,c,dts,dtsi,dtso,h,mk,rst,s,S},Kconfig,Makefile,Makefile.*}]
64
charset = utf-8
75
end_of_line = lf
86
insert_final_newline = true

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
*.o.*
4242
*.patch
4343
*.pyc
44+
*.rlib
4445
*.rmeta
4546
*.rpm
4647
*.rsi

.mailmap

Lines changed: 55 additions & 11 deletions
Large diffs are not rendered by default.

.pylintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[MASTER]
2-
init-hook='import sys; sys.path += ["scripts/lib/kdoc", "scripts/lib/abi", "tools/docs/lib"]'
2+
init-hook='import sys; sys.path += ["tools/lib/python"]'

CREDITS

Lines changed: 41 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ D: One of assisting postmasters for vger.kernel.org's lists
1616
S: (ask for current address)
1717
S: Finland
1818

19+
N: Kishon Vijay Abraham I
20+
21+
D: Generic Phy Framework
22+
1923
N: Thomas Abraham
2024
2125
D: Samsung pin controller driver
@@ -691,7 +695,7 @@ S: USA
691695
N: Chih-Jen Chang
692696
693697
694-
D: IGMP(Internet Group Management Protocol) version 2
698+
D: IGMP (Internet Group Management Protocol) version 2
695699
S: 3F, 65 Tajen street
696700
S: Tamsui town, Taipei county,
697701
S: Taiwan 251
@@ -1238,6 +1242,10 @@ N: Veaceslav Falico
12381242
12391243
D: Co-maintainer and co-author of the network bonding driver.
12401244

1245+
N: Thomas Falcon
1246+
1247+
D: Initial author of the IBM ibmvnic network driver
1248+
12411249
N: János Farkas
12421250
12431251
D: romfs, various (mostly networking) fixes
@@ -1394,7 +1402,7 @@ D: SRM environment driver (for Alpha systems)
13941402
P: 1024D/8399E1BB 250D 3BCF 7127 0D8C A444 A961 1DBD 5E75 8399 E1BB
13951403

13961404
N: Thomas Gleixner
1397-
E: tglx@linutronix.de
1405+
E: tglx@kernel.org
13981406
D: NAND flash hardware support, JFFS2 on NAND flash
13991407

14001408
N: Jérôme Glisse
@@ -1983,6 +1991,7 @@ D: netfilter: TCP window tracking code
19831991
D: netfilter: raw table
19841992
D: netfilter: iprange match
19851993
D: netfilter: new logging interfaces
1994+
D: netfilter: ipset
19861995
D: netfilter: various other hacks
19871996
S: Tata
19881997
S: Hungary
@@ -1992,7 +2001,7 @@ E: [email protected]
19922001
19932002
D: Author of a menu based configuration tool, kmenu, which
19942003
D: is the predecessor of 'make menuconfig' and 'make xconfig'.
1995-
D: digiboard driver update(modularisation work and 2.1.x upd)
2004+
D: digiboard driver update (modularisation work and 2.1.x upd)
19962005
S: Tallak 95
19972006
S: 8103 Rein
19982007
S: Austria
@@ -2056,16 +2065,15 @@ S: Korte Heul 95
20562065
S: 1403 ND BUSSUM
20572066
S: The Netherlands
20582067

2059-
N: Martin Kepplinger
2068+
N: Martin Kepplinger-Novakovic
20602069
2061-
2062-
W: http://www.martinkepplinger.com
20632070
P: 4096R/5AB387D3 F208 2B88 0F9E 4239 3468 6E3F 5003 98DF 5AB3 87D3
20642071
D: mma8452 accelerators iio driver
20652072
D: pegasus_notetaker input driver
2073+
D: imx8m media and hi846 sensor driver
20662074
D: Kernel fixes and cleanups
2067-
S: Garnisonstraße 26
2068-
S: 4020 Linz
2075+
S: Keplerstr. 6
2076+
S: 4050 Traun
20692077
S: Austria
20702078

20712079
N: Karl Keyte
@@ -2227,6 +2235,10 @@ S: Markham, Ontario
22272235
S: L3R 8B2
22282236
S: Canada
22292237

2238+
N: Krzysztof Kozlowski
2239+
2240+
D: NFC network subsystem and drivers maintainer
2241+
22302242
N: Christian Krafft
22312243
D: PowerPC Cell support
22322244

@@ -2407,6 +2419,10 @@ S: Am Muehlenweg 38
24072419
S: D53424 Remagen
24082420
S: Germany
24092421

2422+
N: Jonathan Lemon
2423+
2424+
D: OpenCompute PTP clock driver (ptp_ocp)
2425+
24102426
N: Colin Leroy
24112427
24122428
W: http://www.geekounet.org/
@@ -2655,6 +2671,10 @@ S: 3404 E. Harmony Road
26552671
S: Fort Collins, CO 80528
26562672
S: USA
26572673

2674+
N: Jon Mason
2675+
2676+
D: Neterion 10GbE drivers (s2io/vxge)
2677+
26582678
N: Torben Mathiasen
26592679
26602680
@@ -3480,7 +3500,8 @@ S: Brazil
34803500
N: Stephen Rothwell
34813501
34823502
W: http://www.canb.auug.org.au/~sfr
3483-
P: 1024/BD8C7805 CD A4 9D 01 10 6E 7E 3B 91 88 FA D9 C8 40 AA 02
3503+
P: 4096R/5AD24211C060D1C8 D41C A3ED 5B30 275C F5A0 1B05 5AD2 4211 C060 D1C8
3504+
D: Created linux-next and maintained it 2008-2026
34843505
D: Boot/setup/build work for setup > 2K
34853506
D: Author, APM driver
34863507
D: Directory notification
@@ -3605,7 +3626,7 @@ S: Finland
36053626
N: Deepak Saxena
36063627
36073628
D: I2O kernel layer (config, block, core, pci, net). I2O disk support for LILO
3608-
D: XScale(IOP, IXP) porting and other random ARM bits
3629+
D: XScale (IOP, IXP) porting and other random ARM bits
36093630
S: Portland, OR
36103631

36113632
N: Eric Schenk
@@ -3763,6 +3784,11 @@ S: 10 Stockalls Place
37633784
S: Minto, NSW, 2566
37643785
S: Australia
37653786

3787+
N: Tim Small
3788+
3789+
D: Intel 82443BX/GX (440BX/GX chipset) EDAC driver
3790+
D: Radisys 82600 embedded chipset EDAC driver
3791+
37663792
N: Stephen Smalley
37673793
37683794
D: portions of the Linux Security Module (LSM) framework and security modules
@@ -3797,6 +3823,10 @@ S: Post Office Box 500
37973823
S: Batavia, Illinois 60510
37983824
S: USA
37993825

3826+
N: Jes Sorensen
3827+
3828+
D: HIPPI support and Essential RoadRunner driver
3829+
38003830
N: Leo Spiekman
38013831
38023832
W: http://www.netlabs.net/hp/leo/
@@ -3982,7 +4012,7 @@ S: D-50968 Köln
39824012

39834013
N: Tsu-Sheng Tsao
39844014
3985-
D: IGMP(Internet Group Management Protocol) version 2
4015+
D: IGMP (Internet Group Management Protocol) version 2
39864016
S: 2F 14 ALY 31 LN 166 SEC 1 SHIH-PEI RD
39874017
S: Taipei
39884018
S: Taiwan 112

Documentation/.renames.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -819,7 +819,6 @@ networking/device_drivers/intel/ixgbe networking/device_drivers/ethernet/intel/i
819819
networking/device_drivers/intel/ixgbevf networking/device_drivers/ethernet/intel/ixgbevf
820820
networking/device_drivers/marvell/octeontx2 networking/device_drivers/ethernet/marvell/octeontx2
821821
networking/device_drivers/microsoft/netvsc networking/device_drivers/ethernet/microsoft/netvsc
822-
networking/device_drivers/neterion/s2io networking/device_drivers/ethernet/neterion/s2io
823822
networking/device_drivers/netronome/nfp networking/device_drivers/ethernet/netronome/nfp
824823
networking/device_drivers/pensando/ionic networking/device_drivers/ethernet/pensando/ionic
825824
networking/device_drivers/qualcomm/rmnet networking/device_drivers/cellular/qualcomm/rmnet
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
NOTE: all the ABIs listed in this file are deprecated and will be removed after 2028.
2+
3+
Here are the alternative ABIs:
4+
+------------------------------------+-----------------------------------------+
5+
| Deprecated | Alternative |
6+
+------------------------------------+-----------------------------------------+
7+
| /sys/kernel/kexec_loaded | /sys/kernel/kexec/loaded |
8+
+------------------------------------+-----------------------------------------+
9+
| /sys/kernel/kexec_crash_loaded | /sys/kernel/kexec/crash_loaded |
10+
+------------------------------------+-----------------------------------------+
11+
| /sys/kernel/kexec_crash_size | /sys/kernel/kexec/crash_size |
12+
+------------------------------------+-----------------------------------------+
13+
| /sys/kernel/crash_elfcorehdr_size | /sys/kernel/kexec/crash_elfcorehdr_size |
14+
+------------------------------------+-----------------------------------------+
15+
| /sys/kernel/kexec_crash_cma_ranges | /sys/kernel/kexec/crash_cma_ranges |
16+
+------------------------------------+-----------------------------------------+
17+
18+
19+
What: /sys/kernel/kexec_loaded
20+
Date: Jun 2006
21+
22+
Description: read only
23+
Indicates whether a new kernel image has been loaded
24+
into memory using the kexec system call. It shows 1 if
25+
a kexec image is present and ready to boot, or 0 if none
26+
is loaded.
27+
User: kexec tools, kdump service
28+
29+
What: /sys/kernel/kexec_crash_loaded
30+
Date: Jun 2006
31+
32+
Description: read only
33+
Indicates whether a crash (kdump) kernel is currently
34+
loaded into memory. It shows 1 if a crash kernel has been
35+
successfully loaded for panic handling, or 0 if no crash
36+
kernel is present.
37+
User: Kexec tools, Kdump service
38+
39+
What: /sys/kernel/kexec_crash_size
40+
Date: Dec 2009
41+
42+
Description: read/write
43+
Shows the amount of memory reserved for loading the crash
44+
(kdump) kernel. It reports the size, in bytes, of the
45+
crash kernel area defined by the crashkernel= parameter.
46+
This interface also allows reducing the crashkernel
47+
reservation by writing a smaller value, and the reclaimed
48+
space is added back to the system RAM.
49+
User: Kdump service
50+
51+
What: /sys/kernel/crash_elfcorehdr_size
52+
Date: Aug 2023
53+
54+
Description: read only
55+
Indicates the preferred size of the memory buffer for the
56+
ELF core header used by the crash (kdump) kernel. It defines
57+
how much space is needed to hold metadata about the crashed
58+
system, including CPU and memory information. This information
59+
is used by the user space utility kexec to support updating the
60+
in-kernel kdump image during hotplug operations.
61+
User: Kexec tools
62+
63+
What: /sys/kernel/kexec_crash_cma_ranges
64+
Date: Nov 2025
65+
66+
Description: read only
67+
Provides information about the memory ranges reserved from
68+
the Contiguous Memory Allocator (CMA) area that are allocated
69+
to the crash (kdump) kernel. It lists the start and end physical
70+
addresses of CMA regions assigned for crashkernel use.
71+
User: kdump service

Documentation/ABI/stable/sysfs-block

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -609,6 +609,51 @@ Description:
609609
enabled, and whether tags are shared.
610610

611611

612+
What: /sys/block/<disk>/queue/async_depth
613+
Date: August 2025
614+
615+
Description:
616+
[RW] Controls how many asynchronous requests may be allocated
617+
in the block layer. The value is always capped at nr_requests.
618+
619+
When no elevator is active (none):
620+
621+
- async_depth is always equal to nr_requests.
622+
623+
For bfq scheduler:
624+
625+
- By default, async_depth is set to 75% of nr_requests.
626+
Internal limits are then derived from this value:
627+
628+
* Sync writes: limited to async_depth (≈75% of nr_requests).
629+
* Async I/O: limited to ~2/3 of async_depth (≈50% of
630+
nr_requests).
631+
632+
If a bfq_queue is weight-raised:
633+
634+
* Sync writes: limited to ~1/2 of async_depth (≈37% of
635+
nr_requests).
636+
* Async I/O: limited to ~1/4 of async_depth (≈18% of
637+
nr_requests).
638+
639+
- If the user writes a custom value to async_depth, BFQ will
640+
recompute these limits proportionally based on the new value.
641+
642+
For Kyber:
643+
644+
- By default async_depth is set to 75% of nr_requests.
645+
- If the user writes a custom value to async_depth, then it
646+
overrides the default and directly controls the limit for
647+
writes and async I/O.
648+
649+
For mq-deadline:
650+
651+
- By default async_depth is set to nr_requests.
652+
- If the user writes a custom value to async_depth, then it
653+
overrides the default and directly controls the limit for
654+
writes and async I/O.
655+
656+
612657
What: /sys/block/<disk>/queue/nr_zones
613658
Date: November 2018
614659
Contact: Damien Le Moal <[email protected]>

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,21 @@ Description: The last executed device administrative command's status/error.
136136
Also last configuration error overloaded.
137137
Writing to it will clear the status.
138138

139+
What: /sys/bus/dsa/devices/dsa<m>/dsacaps
140+
Date: April 5, 2026
141+
KernelVersion: 6.20.0
142+
143+
Description: The DSA3 specification introduces three new capability
144+
registers: dsacap[0-2]. User components (e.g., configuration
145+
libraries and workload applications) require this information
146+
to properly utilize the DSA3 features.
147+
This includes SGL capability support, Enabling hardware-specific
148+
optimizations, Configuring memory, etc.
149+
The output format is '<dsacap2>,<dsacap1>,<dsacap0>' where each
150+
DSA cap value is a 64 bit hex value.
151+
This attribute should only be visible on DSA devices of version
152+
3 or later.
153+
139154
What: /sys/bus/dsa/devices/dsa<m>/iaa_cap
140155
Date: Sept 14, 2022
141156
KernelVersion: 6.0.0

0 commit comments

Comments
 (0)