Skip to content

Commit 8b87f67

Browse files
committed
Merge branch 'next' into for-linus
Prepare input updates for 6.18 merge window.
2 parents 30989f6 + c7866ee commit 8b87f67

13,043 files changed

Lines changed: 555027 additions & 304925 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.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ modules.order
114114
!.gitignore
115115
!.kunitconfig
116116
!.mailmap
117+
!.pylintrc
117118
!.rustfmt.toml
118119

119120
#

.mailmap

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ Benjamin Poirier <[email protected]> <[email protected]>
138138
Benjamin Tissoires <[email protected]> <[email protected]>
139139
Benjamin Tissoires <[email protected]> <[email protected]>
140140
141+
141142
142143
143144
@@ -197,6 +198,7 @@ Daniel Borkmann <[email protected]> <[email protected]>
197198
198199
199200
201+
200202
David Brownell <[email protected]>
201203
202204
@@ -222,6 +224,8 @@ Dmitry Safonov <[email protected]> <[email protected]>
222224
223225
Domen Puncer <[email protected]>
224226
Douglas Gilbert <[email protected]>
227+
228+
225229
Ed L. Cashin <[email protected]>
226230
227231
Enric Balletbo i Serra <[email protected]> <[email protected]>
@@ -282,8 +286,10 @@ Gustavo Padovan <[email protected]>
282286
Gustavo Padovan <[email protected]>
283287
284288
285-
286-
289+
290+
291+
292+
287293
288294
289295
@@ -412,6 +418,7 @@ Kenneth W Chen <[email protected]>
412418
413419
414420
421+
Kirill A. Shutemov <[email protected]> <[email protected]>
415422
Kishon Vijay Abraham I <[email protected]> <[email protected]>
416423
417424
@@ -426,6 +433,9 @@ Krzysztof Wilczyński <[email protected]> <[email protected]>
426433
Krzysztof Wilczyński <[email protected]> <[email protected]>
427434
428435
Kuninori Morimoto <[email protected]>
436+
437+
438+
429439
430440
431441
@@ -663,6 +673,7 @@ Muchun Song <[email protected]> <[email protected]>
663673
664674
Rudolf Marek <[email protected]>
665675
Rui Saraiva <[email protected]>
676+
666677
Sachin P Sant <[email protected]>
667678
Sai Prakash Ranjan <[email protected]> <[email protected]>
668679
@@ -686,11 +697,16 @@ Sedat Dilek <[email protected]> <[email protected]>
686697
687698
688699
700+
Sergey Senozhatsky <[email protected]> <[email protected]>
701+
Sergey Senozhatsky <[email protected]> <[email protected]>
702+
Sergey Senozhatsky <[email protected]> <[email protected]>
703+
Sergey Senozhatsky <[email protected]> <[email protected]>
689704
690705
691-
692-
693-
706+
707+
708+
709+
694710
Sharath Chandra Vurukala <[email protected]> <[email protected]>
695711
696712
@@ -719,6 +735,7 @@ Srinivas Ramana <[email protected]> <[email protected]>
719735
720736
721737
Stanislav Fomichev <[email protected]> <[email protected]>
738+
Stanislav Fomichev <[email protected]> <[email protected]>
722739
723740
Stéphane Witzmann <[email protected]>
724741
@@ -823,3 +840,6 @@ Yosry Ahmed <[email protected]> <[email protected]>
823840
Yusuke Goda <[email protected]>
824841
825842
843+
844+
845+

CREDITS

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1397,6 +1397,10 @@ N: Thomas Gleixner
13971397
13981398
D: NAND flash hardware support, JFFS2 on NAND flash
13991399

1400+
N: Jérôme Glisse
1401+
1402+
D: HMM - Heterogeneous Memory Management
1403+
14001404
N: Richard E. Gooch
14011405
14021406
D: parent process death signal to children
@@ -2981,6 +2985,11 @@ S: 521 Pleasant Valley Road
29812985
S: Potsdam, New York 13676
29822986
S: USA
29832987

2988+
N: Shannon Nelson
2989+
2990+
D: Worked on several network drivers including
2991+
D: ixgbe, i40e, ionic, pds_core, pds_vdpa, pds_fwctl
2992+
29842993
N: Dave Neuer
29852994
29862995
D: Helped implement support for Compaq's H31xx series iPAQs
@@ -4369,6 +4378,12 @@ S: 542 West 112th Street, 5N
43694378
S: New York, New York 10025
43704379
S: USA
43714380

4381+
N: Masahiro Yamada
4382+
4383+
D: Kbuild Maintainer 2017-2025
4384+
D: Kconfig Maintainer 2018-2025
4385+
S: Japan
4386+
43724387
N: Li Yang
43734388
43744389
D: Freescale Highspeed USB device driver

Documentation/ABI/README

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ Every file in these directories will contain the following information:
4646

4747
What: Short description of the interface
4848
Date: Date created
49-
KernelVersion: Kernel version this feature first showed up in.
49+
KernelVersion: (Optional) Kernel version this feature first showed up in.
50+
Note: git history often provides more accurate version
51+
info, so this field may be omitted.
5052
Contact: Primary contact for this interface (may be a mailing list)
5153
Description: Long description of the interface and how to use it.
5254
Users: All users of this interface who wish to be notified when
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
What: /sys/kernel/debug/tracing
2+
Date: May 2008
3+
KernelVersion: 2.6.27
4+
5+
Description:
6+
7+
The ftrace was first added to the kernel, its interface was placed
8+
into the debugfs file system under the "tracing" directory. Access
9+
to the files were in /sys/kernel/debug/tracing. As systems wanted
10+
access to the tracing interface without having to enable debugfs, a
11+
new interface was created called "tracefs". This was a stand alone
12+
file system and was usually mounted in /sys/kernel/tracing.
13+
14+
To allow older tooling to continue to operate, when mounting
15+
debugfs, the tracefs file system would automatically get mounted in
16+
the "tracing" directory of debugfs. The tracefs interface was added
17+
in January 2015 in the v4.1 kernel.
18+
19+
All tooling should now be using tracefs directly and the "tracing"
20+
directory in debugfs should be removed by January 2030.

Documentation/ABI/obsolete/sysfs-bus-iio

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ What: /sys/.../iio:deviceX/scan_elements/in_timestamp_en
4848
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_supply_en
4949
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_en
5050
What: /sys/.../iio:deviceX/scan_elements/in_voltageY-voltageZ_en
51-
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_i_en
52-
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_q_en
53-
What: /sys/.../iio:deviceX/scan_elements/in_voltage_i_en
54-
What: /sys/.../iio:deviceX/scan_elements/in_voltage_q_en
5551
What: /sys/.../iio:deviceX/scan_elements/in_incli_x_en
5652
What: /sys/.../iio:deviceX/scan_elements/in_incli_y_en
5753
What: /sys/.../iio:deviceX/scan_elements/in_pressureY_en
@@ -73,10 +69,6 @@ What: /sys/.../iio:deviceX/scan_elements/in_incli_type
7369
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_type
7470
What: /sys/.../iio:deviceX/scan_elements/in_voltage_type
7571
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_supply_type
76-
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_i_type
77-
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_q_type
78-
What: /sys/.../iio:deviceX/scan_elements/in_voltage_i_type
79-
What: /sys/.../iio:deviceX/scan_elements/in_voltage_q_type
8072
What: /sys/.../iio:deviceX/scan_elements/in_timestamp_type
8173
What: /sys/.../iio:deviceX/scan_elements/in_pressureY_type
8274
What: /sys/.../iio:deviceX/scan_elements/in_pressure_type
@@ -110,10 +102,6 @@ Description:
110102

111103
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_index
112104
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_supply_index
113-
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_i_index
114-
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_q_index
115-
What: /sys/.../iio:deviceX/scan_elements/in_voltage_i_index
116-
What: /sys/.../iio:deviceX/scan_elements/in_voltage_q_index
117105
What: /sys/.../iio:deviceX/scan_elements/in_accel_x_index
118106
What: /sys/.../iio:deviceX/scan_elements/in_accel_y_index
119107
What: /sys/.../iio:deviceX/scan_elements/in_accel_z_index
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
What: /sys/devices/platform/samsung/battery_life_extender
2+
Date: December 1, 2011
3+
KernelVersion: 3.3
4+
Contact: Corentin Chary <[email protected]>
5+
Description: Max battery charge level can be modified, battery cycle
6+
life can be extended by reducing the max battery charge
7+
level.
8+
9+
- 0 means normal battery mode (100% charge)
10+
- 1 means battery life extender mode (80% charge)

Documentation/ABI/obsolete/sysfs-gpio

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,22 @@ Description:
1919
/export ... asks the kernel to export a GPIO to userspace
2020
/unexport ... to return a GPIO to the kernel
2121
/gpioN ... for each exported GPIO #N OR
22-
/<LINE-NAME> ... for a properly named GPIO line
2322
/value ... always readable, writes fail for input GPIOs
2423
/direction ... r/w as: in, out (default low); write: high, low
2524
/edge ... r/w as: none, falling, rising, both
25+
/active_low ... r/w as: 0, 1
2626
/gpiochipN ... for each gpiochip; #N is its first GPIO
2727
/base ... (r/o) same as N
28-
/label ... (r/o) descriptive, not necessarily unique
28+
/label ... (r/o) descriptive chip name
2929
/ngpio ... (r/o) number of GPIOs; numbered N to N + (ngpio - 1)
30+
/gpio<OFFSET>
31+
/value ... always readable, writes fail for input GPIOs
32+
/direction ... r/w as: in, out (default low); write: high, low
33+
/chipX ... for each gpiochip; #X is the gpio device ID
34+
/export ... asks the kernel to export a GPIO at HW offset X to userspace
35+
/unexport ... to return a GPIO at HW offset X to the kernel
36+
/label ... (r/o) descriptive chip name
37+
/ngpio ... (r/o) number of GPIOs exposed by the chip
3038

3139
This ABI is obsoleted by Documentation/ABI/testing/gpio-cdev and will be
3240
removed after 2020.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
What: /sys/bus/platform/devices/VPC2004:*/conservation_mode
2+
Date: Aug 2017
3+
KernelVersion: 4.14
4+
5+
Description:
6+
Controls whether the conservation mode is enabled or not.
7+
This feature limits the maximum battery charge percentage to
8+
around 50-60% in order to prolong the lifetime of the battery.

Documentation/ABI/stable/sysfs-block

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ Contact: [email protected]
731731
Description:
732732
[RW] If the device is registered for writeback throttling, then
733733
this file shows the target minimum read latency. If this latency
734-
is exceeded in a given window of time (see wb_window_usec), then
734+
is exceeded in a given window of time (see curr_win_nsec), then
735735
the writeback throttling will start scaling back writes. Writing
736736
a value of '0' to this file disables the feature. Writing a
737737
value of '-1' to this file resets the value to the default
@@ -778,6 +778,39 @@ Description:
778778
0, write zeroes is not supported by the device.
779779

780780

781+
What: /sys/block/<disk>/queue/write_zeroes_unmap_max_hw_bytes
782+
Date: January 2025
783+
Contact: Zhang Yi <[email protected]>
784+
Description:
785+
[RO] This file indicates whether a device supports zeroing data
786+
in a specified block range without incurring the cost of
787+
physically writing zeroes to the media for each individual
788+
block. If this parameter is set to write_zeroes_max_bytes, the
789+
device implements a zeroing operation which opportunistically
790+
avoids writing zeroes to media while still guaranteeing that
791+
subsequent reads from the specified block range will return
792+
zeroed data. This operation is a best-effort optimization, a
793+
device may fall back to physically writing zeroes to the media
794+
due to other factors such as misalignment or being asked to
795+
clear a block range smaller than the device's internal
796+
allocation unit. If this parameter is set to 0, the device may
797+
have to write each logical block media during a zeroing
798+
operation.
799+
800+
801+
What: /sys/block/<disk>/queue/write_zeroes_unmap_max_bytes
802+
Date: January 2025
803+
Contact: Zhang Yi <[email protected]>
804+
Description:
805+
[RW] While write_zeroes_unmap_max_hw_bytes is the hardware limit
806+
for the device, this setting is the software limit. Since the
807+
unmap write zeroes operation is a best-effort optimization, some
808+
devices may still physically writing zeroes to media. So the
809+
speed of this operation is not guaranteed. Writing a value of
810+
'0' to this file disables this operation. Otherwise, this
811+
parameter should be equal to write_zeroes_unmap_max_hw_bytes.
812+
813+
781814
What: /sys/block/<disk>/queue/zone_append_max_bytes
782815
Date: May 2020
783816

0 commit comments

Comments
 (0)