Skip to content

Commit 3e9e952

Browse files
committed
Merge branch 'for-7.1-printf-kunit-build' into for-linus
2 parents aea645c + 8901ac9 commit 3e9e952

12,392 files changed

Lines changed: 282643 additions & 137177 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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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'

.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

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -563,6 +563,7 @@ Michel Dänzer <[email protected]>
563563
Michel Lespinasse <[email protected]>
564564
565565
566+
566567
567568
568569

CREDITS

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2663,6 +2663,10 @@ S: 3404 E. Harmony Road
26632663
S: Fort Collins, CO 80528
26642664
S: USA
26652665

2666+
N: Jon Mason
2667+
2668+
D: Neterion 10GbE drivers (s2io/vxge)
2669+
26662670
N: Torben Mathiasen
26672671
26682672
@@ -3488,7 +3492,8 @@ S: Brazil
34883492
N: Stephen Rothwell
34893493
34903494
W: http://www.canb.auug.org.au/~sfr
3491-
P: 1024/BD8C7805 CD A4 9D 01 10 6E 7E 3B 91 88 FA D9 C8 40 AA 02
3495+
P: 4096R/5AD24211C060D1C8 D41C A3ED 5B30 275C F5A0 1B05 5AD2 4211 C060 D1C8
3496+
D: Created linux-next and maintained it 2008-2026
34923497
D: Boot/setup/build work for setup > 2K
34933498
D: Author, APM driver
34943499
D: Directory notification
@@ -3810,6 +3815,10 @@ S: Post Office Box 500
38103815
S: Batavia, Illinois 60510
38113816
S: USA
38123817

3818+
N: Jes Sorensen
3819+
3820+
D: HIPPI support and Essential RoadRunner driver
3821+
38133822
N: Leo Spiekman
38143823
38153824
W: http://www.netlabs.net/hp/leo/

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

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

Documentation/ABI/stable/sysfs-driver-speakup

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ What: /sys/accessibility/speakup/bleep_time
2323
KernelVersion: 2.6
2424
2525
Description: This controls the duration of the PC speaker beeps speakup
26-
produces.
27-
TODO: What are the units? Jiffies?
26+
produces, in milliseconds.
2827

2928
What: /sys/accessibility/speakup/cursor_time
3029
KernelVersion: 2.6

Documentation/ABI/testing/configfs-tsm-report

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@ Description:
1717
where the implementation is conveyed via the @provider
1818
attribute.
1919

20+
This interface fails reads and sets errno to EFBIG when the
21+
report generated by @provider exceeds the configfs-tsm-report
22+
internal maximums. Contact the platform provider for the
23+
compatible security module, driver, and attestation library
24+
combination.
25+
2026
What: /sys/kernel/config/tsm/report/$name/auxblob
2127
Date: October, 2023
2228
KernelVersion: v6.7
@@ -31,6 +37,9 @@ Description:
3137
Standardization v2.03 Section 4.1.8.1 MSG_REPORT_REQ.
3238
https://www.amd.com/content/dam/amd/en/documents/epyc-technical-docs/specifications/56421.pdf
3339

40+
See "EFBIG" comment in the @outblob description for potential
41+
error conditions.
42+
3443
What: /sys/kernel/config/tsm/report/$name/manifestblob
3544
Date: January, 2024
3645
KernelVersion: v6.10
@@ -43,6 +52,9 @@ Description:
4352
See 'service_provider' for information on the format of the
4453
manifest blob.
4554

55+
See "EFBIG" comment in the @outblob description for potential
56+
error conditions.
57+
4658
What: /sys/kernel/config/tsm/report/$name/provider
4759
Date: September, 2023
4860
KernelVersion: v6.7
@@ -61,6 +73,10 @@ Description:
6173
Library Revision 0.8 Appendix 4,5
6274
https://download.01.org/intel-sgx/latest/dcap-latest/linux/docs/Intel_TDX_DCAP_Quoting_Library_API.pdf
6375

76+
Intel TDX platforms with DICE-based attestation use CBOR Web Token
77+
(CWT) format for the Quote payload. This is indicated by the Quote
78+
size exceeding 8KB.
79+
6480
What: /sys/kernel/config/tsm/report/$name/generation
6581
Date: September, 2023
6682
KernelVersion: v6.7

Documentation/ABI/testing/configfs-usb-gadget-midi

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ KernelVersion: 3.19
44
Description:
55
The attributes:
66

7-
========== ====================================
8-
index index value for the USB MIDI adapter
9-
id ID string for the USB MIDI adapter
10-
buflen MIDI buffer length
11-
qlen USB read request queue length
12-
in_ports number of MIDI input ports
13-
out_ports number of MIDI output ports
14-
========== ====================================
7+
================ ====================================
8+
index index value for the USB MIDI adapter
9+
id ID string for the USB MIDI adapter
10+
buflen MIDI buffer length
11+
qlen USB read request queue length
12+
in_ports number of MIDI input ports
13+
out_ports number of MIDI output ports
14+
interface_string USB AudioControl interface string
15+
================ ====================================

Documentation/ABI/testing/sysfs-block-zram

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,3 +150,17 @@ Contact: Sergey Senozhatsky <[email protected]>
150150
Description:
151151
The algorithm_params file is write-only and is used to setup
152152
compression algorithm parameters.
153+
154+
What: /sys/block/zram<id>/writeback_compressed
155+
Date: Decemeber 2025
156+
Contact: Richard Chang <[email protected]>
157+
Description:
158+
The writeback_compressed device atrribute toggles compressed
159+
writeback feature.
160+
161+
What: /sys/block/zram<id>/writeback_batch_size
162+
Date: November 2025
163+
Contact: Sergey Senozhatsky <[email protected]>
164+
Description:
165+
The writeback_batch_size device atrribute sets the maximum
166+
number of in-flight writeback operations.

0 commit comments

Comments
 (0)