Skip to content

Commit 36ec807

Browse files
committed
Merge branch 'next' into for-linus
Prepare input updates for 6.12 merge window.
2 parents eb017f4 + 55bef83 commit 36ec807

File tree

20,912 files changed

+1449139
-503475
lines changed

Some content is hidden

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

20,912 files changed

+1449139
-503475
lines changed

.clang-format

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# For more information, see:
66
#
7-
# Documentation/process/clang-format.rst
7+
# Documentation/dev-tools/clang-format.rst
88
# https://clang.llvm.org/docs/ClangFormat.html
99
# https://clang.llvm.org/docs/ClangFormatStyleOptions.html
1010
#

.editorconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@ root = true
55
[{*.{awk,c,dts,dtsi,dtso,h,mk,s,S},Kconfig,Makefile,Makefile.*}]
66
charset = utf-8
77
end_of_line = lf
8-
trim_trailing_whitespace = true
98
insert_final_newline = true
109
indent_style = tab
1110
indent_size = 8
1211

1312
[*.{json,py,rs}]
1413
charset = utf-8
1514
end_of_line = lf
16-
trim_trailing_whitespace = true
1715
insert_final_newline = true
1816
indent_style = space
1917
indent_size = 4
@@ -26,7 +24,6 @@ indent_size = 8
2624
[*.yaml]
2725
charset = utf-8
2826
end_of_line = lf
29-
trim_trailing_whitespace = unset
3027
insert_final_newline = true
3128
indent_style = space
3229
indent_size = 2

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,12 @@ modules.order
9292
#
9393
/tar-install/
9494

95+
#
96+
# pacman files (make pacman-pkg)
97+
#
98+
/PKGBUILD
99+
/pacman/
100+
95101
#
96102
# We don't want to ignore the following even if they are dot-files
97103
#

.mailmap

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ Andrey Ryabinin <[email protected]> <[email protected]>
7272
7373
7474
Andy Adamson <[email protected]>
75+
76+
7577
7678
7779
@@ -133,6 +135,7 @@ Bryan Tan <[email protected]> <[email protected]>
133135
134136
135137
138+
136139
137140
138141
@@ -163,6 +166,7 @@ Daniel Borkmann <[email protected]> <[email protected]>
163166
164167
David Brownell <[email protected]>
165168
169+
166170
167171
168172
@@ -216,6 +220,7 @@ Geliang Tang <[email protected]> <[email protected]>
216220
217221
218222
223+
219224
220225
221226
@@ -256,6 +261,7 @@ Jaegeuk Kim <[email protected]> <[email protected]>
256261
257262
James Bottomley <jejb@mulgrave.(none)>
258263
James Bottomley <[email protected]>
264+
259265
James E Wilson <[email protected]>
260266
261267
@@ -336,17 +342,20 @@ Kalyan Thota <[email protected]> <[email protected]>
336342
Karthikeyan Periyasamy <[email protected]> <[email protected]>
337343
338344
Kay Sievers <[email protected]>
339-
340-
341-
342-
345+
346+
347+
348+
349+
343350
344351
345352
Kenneth W Chen <[email protected]>
346353
347354
348355
349356
Kishon Vijay Abraham I <[email protected]> <[email protected]>
357+
358+
350359
Konstantin Khlebnikov <[email protected]> <[email protected]>
351360
Konstantin Khlebnikov <[email protected]> <[email protected]>
352361
@@ -379,7 +388,9 @@ Li Yang <[email protected]> <[email protected]>
379388
380389
381390
391+
382392
393+
383394
384395
385396
@@ -467,7 +478,10 @@ Nadia Yvette Chambers <[email protected]> William Lee Irwin III <wli@holomorphy
467478
468479
469480
470-
481+
482+
483+
484+
471485
472486
Nguyen Anh Quynh <[email protected]>
473487
@@ -570,7 +584,7 @@ Sarangdhar Joshi <[email protected]>
570584
Sascha Hauer <[email protected]>
571585
572586
Sathishkumar Muruganandam <[email protected]> <[email protected]>
573-
587+
574588
S.Çağlar Onur <[email protected]>
575589
576590
Sean Christopherson <[email protected]> <[email protected]>
@@ -602,6 +616,8 @@ Simon Kelley <[email protected]>
602616
Sricharan Ramabadhran <[email protected]> <[email protected]>
603617
604618
619+
620+
Stanislav Fomichev <[email protected]> <[email protected]>
605621
606622
Stéphane Witzmann <[email protected]>
607623
@@ -682,6 +698,7 @@ Vivien Didelot <[email protected]> <[email protected]>
682698
683699
684700
701+
685702
686703
687704

CREDITS

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,6 +531,13 @@ S: Kopmansg 2
531531
S: 411 13 Goteborg
532532
S: Sweden
533533

534+
N: Daniel Bristot de Oliveira
535+
D: Scheduler contributions, notably: SCHED_DEADLINE
536+
D: Real-time Linux Analysis
537+
D: Runtime Verification
538+
D: OS Noise and Latency Tracers
539+
S: Brazil and Italy
540+
534541
N: Paul Bristow
535542
536543
W: https://paulbristow.net/linux/idefloppy.html
@@ -796,6 +803,11 @@ E: [email protected]
796803
D: Ralink rt2x00 WLAN driver
797804
S: Belas, Portugal
798805

806+
N: Benoît Cousson
807+
808+
D: TI OMAP Devicetree platforms
809+
D: TI OMAP HWMOD boards
810+
799811
N: Alan Cox
800812
W: http://www.linux.org.uk/diary/
801813
D: Linux Networking (0.99.10->2.0.29)
@@ -1214,6 +1226,10 @@ D: UDF filesystem
12141226
S: (ask for current address)
12151227
S: USA
12161228

1229+
N: Larry Finger
1230+
1231+
D: Maintainer of wireless drivers, too many to list here
1232+
12171233
N: Jürgen Fischer
12181234
12191235
D: Author of Adaptec AHA-152x SCSI driver
@@ -3146,9 +3162,11 @@ S: Triftstra=DFe 55
31463162
S: 13353 Berlin
31473163
S: Germany
31483164

3149-
N: Gustavo Pimental
3165+
N: Gustavo Pimentel
31503166
31513167
D: PCI driver for Synopsys DesignWare
3168+
D: Synopsys DesignWare eDMA driver
3169+
D: Synopsys DesignWare xData traffic generator
31523170

31533171
N: Emanuel Pirker
31543172
@@ -4362,6 +4380,10 @@ N: Haojian Zhuang
43624380
43634381
D: MMP support
43644382

4383+
N: Tsahee Zidenberg
4384+
4385+
D: Annapurna Labs Alpine Architecture
4386+
43654387
N: Richard Zidlicky
43664388
43674389
W: http://www.geocities.com/rdzidlic
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
What: /sys/firmware/efi/vars
2+
Date: April 2004, removed March 2023
3+
Description:
4+
This directory exposed interfaces for interacting with
5+
EFI variables. For more information on EFI variables,
6+
see 'Variable Services' in the UEFI specification
7+
(section 7.2 in specification version 2.3 Errata D).
8+
9+
The 'efivars' sysfs interface was removed in March of 2023,
10+
after being considered deprecated no later than September
11+
of 2020. Its functionality has been replaced by the
12+
'efivarfs' filesystem.

Documentation/ABI/stable/sysfs-block

Lines changed: 63 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,59 @@ Description:
2121
device is offset from the internal allocation unit's
2222
natural alignment.
2323

24+
What: /sys/block/<disk>/atomic_write_max_bytes
25+
Date: February 2024
26+
Contact: Himanshu Madhani <[email protected]>
27+
Description:
28+
[RO] This parameter specifies the maximum atomic write
29+
size reported by the device. This parameter is relevant
30+
for merging of writes, where a merged atomic write
31+
operation must not exceed this number of bytes.
32+
This parameter may be greater than the value in
33+
atomic_write_unit_max_bytes as
34+
atomic_write_unit_max_bytes will be rounded down to a
35+
power-of-two and atomic_write_unit_max_bytes may also be
36+
limited by some other queue limits, such as max_segments.
37+
This parameter - along with atomic_write_unit_min_bytes
38+
and atomic_write_unit_max_bytes - will not be larger than
39+
max_hw_sectors_kb, but may be larger than max_sectors_kb.
40+
41+
42+
What: /sys/block/<disk>/atomic_write_unit_min_bytes
43+
Date: February 2024
44+
Contact: Himanshu Madhani <[email protected]>
45+
Description:
46+
[RO] This parameter specifies the smallest block which can
47+
be written atomically with an atomic write operation. All
48+
atomic write operations must begin at a
49+
atomic_write_unit_min boundary and must be multiples of
50+
atomic_write_unit_min. This value must be a power-of-two.
51+
52+
53+
What: /sys/block/<disk>/atomic_write_unit_max_bytes
54+
Date: February 2024
55+
Contact: Himanshu Madhani <[email protected]>
56+
Description:
57+
[RO] This parameter defines the largest block which can be
58+
written atomically with an atomic write operation. This
59+
value must be a multiple of atomic_write_unit_min and must
60+
be a power-of-two. This value will not be larger than
61+
atomic_write_max_bytes.
62+
63+
64+
What: /sys/block/<disk>/atomic_write_boundary_bytes
65+
Date: February 2024
66+
Contact: Himanshu Madhani <[email protected]>
67+
Description:
68+
[RO] A device may need to internally split an atomic write I/O
69+
which straddles a given logical block address boundary. This
70+
parameter specifies the size in bytes of the atomic boundary if
71+
one is reported by the device. This value must be a
72+
power-of-two and at least the size as in
73+
atomic_write_unit_max_bytes.
74+
Any attempt to merge atomic write I/Os must not result in a
75+
merged I/O which crosses this boundary (if any).
76+
2477

2578
What: /sys/block/<disk>/diskseq
2679
Date: February 2021
@@ -101,6 +154,16 @@ Description:
101154
devices that support receiving integrity metadata.
102155

103156

157+
What: /sys/block/<disk>/partscan
158+
Date: May 2024
159+
Contact: Christoph Hellwig <[email protected]>
160+
Description:
161+
The /sys/block/<disk>/partscan files reports if partition
162+
scanning is enabled for the disk. It returns "1" if partition
163+
scanning is enabled, or "0" if not. The value type is a 32-bit
164+
unsigned integer, but only "0" and "1" are valid values.
165+
166+
104167
What: /sys/block/<disk>/<partition>/alignment_offset
105168
Date: April 2009
106169
Contact: Martin K. Petersen <[email protected]>
@@ -584,18 +647,6 @@ Description:
584647
the data. If no such restriction exists, this file will contain
585648
'0'. This file is writable for testing purposes.
586649

587-
588-
What: /sys/block/<disk>/queue/throttle_sample_time
589-
Date: March 2017
590-
591-
Description:
592-
[RW] This is the time window that blk-throttle samples data, in
593-
millisecond. blk-throttle makes decision based on the
594-
samplings. Lower time means cgroups have more smooth throughput,
595-
but higher CPU overhead. This exists only when
596-
CONFIG_BLK_DEV_THROTTLING_LOW is enabled.
597-
598-
599650
What: /sys/block/<disk>/queue/virt_boundary_mask
600651
Date: April 2021
601652

Documentation/ABI/stable/sysfs-bus-mhi

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,16 @@ Description: Initiates a SoC reset on the MHI controller. A SoC reset is
2929
This can be useful as a method of recovery if the device is
3030
non-responsive, or as a means of loading new firmware as a
3131
system administration task.
32+
33+
What: /sys/bus/mhi/devices/.../trigger_edl
34+
Date: April 2024
35+
KernelVersion: 6.10
36+
37+
Description: Writing a non-zero value to this file will force devices to
38+
enter EDL (Emergency Download) mode. This entry only exists for
39+
devices capable of entering the EDL mode using the standard EDL
40+
triggering mechanism defined in the MHI spec v1.2. Once in EDL
41+
mode, the flash programmer image can be downloaded to the
42+
device to enter the flash programmer execution environment.
43+
This can be useful if user wants to use QDL (Qualcomm Download,
44+
which is used to download firmware over EDL) to update firmware.

Documentation/ABI/stable/sysfs-bus-nvmem

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,23 @@
1+
What: /sys/bus/nvmem/devices/.../force_ro
2+
Date: June 2024
3+
KernelVersion: 6.11
4+
Contact: Marek Vasut <[email protected]>
5+
Description:
6+
This read/write attribute allows users to set read-write
7+
devices as read-only and back to read-write from userspace.
8+
This can be used to unlock and relock write-protection of
9+
devices which are generally locked, except during sporadic
10+
programming operation.
11+
Read returns '0' or '1' for read-write or read-only modes
12+
respectively.
13+
Write parses one of 'YyTt1NnFf0', or [oO][NnFf] for "on"
14+
and "off", i.e. what kstrbool() supports.
15+
Note: This file is only present if CONFIG_NVMEM_SYSFS
16+
is enabled.
17+
118
What: /sys/bus/nvmem/devices/.../nvmem
219
Date: July 2015
3-
KernelVersion: 4.2
20+
KernelVersion: 4.2
421
Contact: Srinivas Kandagatla <[email protected]>
522
Description:
623
This file allows user to read/write the raw NVMEM contents.
@@ -20,3 +37,14 @@ Description:
2037
...
2138
*
2239
0001000
40+
41+
What: /sys/bus/nvmem/devices/.../type
42+
Date: November 2018
43+
KernelVersion: 5.0
44+
Contact: Alexandre Belloni <[email protected]>
45+
Description:
46+
This read-only attribute allows user to read the NVMEM
47+
device type. Supported types are "Unknown", "EEPROM",
48+
"OTP", "Battery backed", "FRAM".
49+
Note: This file is only present if CONFIG_NVMEM_SYSFS
50+
is enabled.

0 commit comments

Comments
 (0)