Skip to content

Commit 702fdf3

Browse files
committed
Merge drm/drm-next into drm-intel-next
Catching up with some display dependencies. Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
2 parents b69f8c4 + 4bf83dd commit 702fdf3

File tree

12,508 files changed

+543777
-296288
lines changed

Some content is hidden

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

12,508 files changed

+543777
-296288
lines changed

.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: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ Benjamin Poirier <benjamin.poirier@gmail.com> <bpoirier@suse.de>
138138
Benjamin Tissoires <bentiss@kernel.org> <benjamin.tissoires@gmail.com>
139139
Benjamin Tissoires <bentiss@kernel.org> <benjamin.tissoires@redhat.com>
140140
Benno Lossin <lossin@kernel.org> <benno.lossin@proton.me>
141+
Bernard Metzler <bernard.metzler@linux.dev> <bmt@zurich.ibm.com>
141142
Bingwu Zhang <xtex@aosc.io> <xtexchooser@duck.com>
142143
Bingwu Zhang <xtex@aosc.io> <xtex@xtexx.eu.org>
143144
Bjorn Andersson <andersson@kernel.org> <bjorn@kryo.se>
@@ -163,6 +164,8 @@ Casey Connolly <casey.connolly@linaro.org> <caleb@connolly.tech>
163164
Casey Connolly <casey.connolly@linaro.org> <caleb@postmarketos.org>
164165
Can Guo <quic_cang@quicinc.com> <cang@codeaurora.org>
165166
Carl Huang <quic_cjhuang@quicinc.com> <cjhuang@codeaurora.org>
167+
Carl Vanderlip <carl.vanderlip@oss.qualcomm.com> <carlv@codeaurora.org>
168+
Carl Vanderlip <carl.vanderlip@oss.qualcomm.com> <quic_carlv@quicinc.com>
166169
Carlos Bilbao <carlos.bilbao@kernel.org> <carlos.bilbao@amd.com>
167170
Carlos Bilbao <carlos.bilbao@kernel.org> <carlos.bilbao.osdev@gmail.com>
168171
Carlos Bilbao <carlos.bilbao@kernel.org> <bilbao@vt.edu>
@@ -197,6 +200,7 @@ Daniel Borkmann <daniel@iogearbox.net> <daniel.borkmann@tik.ee.ethz.ch>
197200
Daniel Borkmann <daniel@iogearbox.net> <dborkmann@redhat.com>
198201
Daniel Borkmann <daniel@iogearbox.net> <dborkman@redhat.com>
199202
Daniel Borkmann <daniel@iogearbox.net> <dxchgb@gmail.com>
203+
Danilo Krummrich <dakr@kernel.org> <dakr@redhat.com>
200204
David Brownell <david-b@pacbell.net>
201205
David Collins <quic_collinsd@quicinc.com> <collinsd@codeaurora.org>
202206
David Heidelberg <david@ixit.cz> <d.okias@gmail.com>
@@ -222,6 +226,8 @@ Dmitry Safonov <0x7f454c46@gmail.com> <d.safonov@partner.samsung.com>
222226
Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>
223227
Domen Puncer <domen@coderock.org>
224228
Douglas Gilbert <dougg@torque.net>
229+
Drew Fustini <fustini@kernel.org> <drew@pdp7.com>
230+
<duje@dujemihanovic.xyz> <duje.mihanovic@skole.hr>
225231
Ed L. Cashin <ecashin@coraid.com>
226232
Elliot Berman <quic_eberman@quicinc.com> <eberman@codeaurora.org>
227233
Enric Balletbo i Serra <eballetbo@kernel.org> <enric.balletbo@collabora.com>
@@ -282,8 +288,10 @@ Gustavo Padovan <gustavo@las.ic.unicamp.br>
282288
Gustavo Padovan <padovan@profusion.mobi>
283289
Hamza Mahfooz <hamzamahfooz@linux.microsoft.com> <hamza.mahfooz@amd.com>
284290
Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>
285-
Hans Verkuil <hverkuil@xs4all.nl> <hansverk@cisco.com>
286-
Hans Verkuil <hverkuil@xs4all.nl> <hverkuil-cisco@xs4all.nl>
291+
Hans de Goede <hansg@kernel.org> <hdegoede@redhat.com>
292+
Hans Verkuil <hverkuil@kernel.org> <hverkuil@xs4all.nl>
293+
Hans Verkuil <hverkuil@kernel.org> <hverkuil-cisco@xs4all.nl>
294+
Hans Verkuil <hverkuil@kernel.org> <hansverk@cisco.com>
287295
Harry Yoo <harry.yoo@oracle.com> <42.hyeyoo@gmail.com>
288296
Heiko Carstens <hca@linux.ibm.com> <h.carstens@de.ibm.com>
289297
Heiko Carstens <hca@linux.ibm.com> <heiko.carstens@de.ibm.com>
@@ -412,6 +420,7 @@ Kenneth W Chen <kenneth.w.chen@intel.com>
412420
Kenneth Westfield <quic_kwestfie@quicinc.com> <kwestfie@codeaurora.org>
413421
Kiran Gunda <quic_kgunda@quicinc.com> <kgunda@codeaurora.org>
414422
Kirill Tkhai <tkhai@ya.ru> <ktkhai@virtuozzo.com>
423+
Kirill A. Shutemov <kas@kernel.org> <kirill.shutemov@linux.intel.com>
415424
Kishon Vijay Abraham I <kishon@kernel.org> <kishon@ti.com>
416425
Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@linaro.org>
417426
Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@somainline.org>
@@ -666,6 +675,7 @@ Muchun Song <muchun.song@linux.dev> <smuchun@gmail.com>
666675
Ross Zwisler <zwisler@kernel.org> <ross.zwisler@linux.intel.com>
667676
Rudolf Marek <R.Marek@sh.cvut.cz>
668677
Rui Saraiva <rmps@joel.ist.utl.pt>
678+
Sachin Mokashi <sachin.mokashi@intel.com> <sachinx.mokashi@intel.com>
669679
Sachin P Sant <ssant@in.ibm.com>
670680
Sai Prakash Ranjan <quic_saipraka@quicinc.com> <saiprakash.ranjan@codeaurora.org>
671681
Sakari Ailus <sakari.ailus@linux.intel.com> <sakari.ailus@iki.fi>
@@ -689,11 +699,16 @@ Sedat Dilek <sedat.dilek@gmail.com> <sedat.dilek@credativ.de>
689699
Senthilkumar N L <quic_snlakshm@quicinc.com> <snlakshm@codeaurora.org>
690700
Serge Hallyn <sergeh@kernel.org> <serge.hallyn@canonical.com>
691701
Serge Hallyn <sergeh@kernel.org> <serue@us.ibm.com>
702+
Sergey Senozhatsky <senozhatsky@chromium.org> <sergey.senozhatsky.work@gmail.com>
703+
Sergey Senozhatsky <senozhatsky@chromium.org> <sergey.senozhatsky@gmail.com>
704+
Sergey Senozhatsky <senozhatsky@chromium.org> <sergey.senozhatsky@mail.by>
705+
Sergey Senozhatsky <senozhatsky@chromium.org> <senozhatsky@google.com>
692706
Seth Forshee <sforshee@kernel.org> <seth.forshee@canonical.com>
693707
Shakeel Butt <shakeel.butt@linux.dev> <shakeelb@google.com>
694-
Shannon Nelson <shannon.nelson@amd.com> <snelson@pensando.io>
695-
Shannon Nelson <shannon.nelson@amd.com> <shannon.nelson@intel.com>
696-
Shannon Nelson <shannon.nelson@amd.com> <shannon.nelson@oracle.com>
708+
Shannon Nelson <sln@onemain.com> <shannon.nelson@amd.com>
709+
Shannon Nelson <sln@onemain.com> <snelson@pensando.io>
710+
Shannon Nelson <sln@onemain.com> <shannon.nelson@intel.com>
711+
Shannon Nelson <sln@onemain.com> <shannon.nelson@oracle.com>
697712
Sharath Chandra Vurukala <quic_sharathv@quicinc.com> <sharathv@codeaurora.org>
698713
Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
699714
Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>
@@ -827,3 +842,6 @@ Yosry Ahmed <yosry.ahmed@linux.dev> <yosryahmed@google.com>
827842
Yusuke Goda <goda.yusuke@renesas.com>
828843
Zack Rusin <zack.rusin@broadcom.com> <zackr@vmware.com>
829844
Zhu Yanjun <zyjzyj2000@gmail.com> <yanjunz@nvidia.com>
845+
Zijun Hu <zijun.hu@oss.qualcomm.com> <quic_zijuhu@quicinc.com>
846+
Zijun Hu <zijun.hu@oss.qualcomm.com> <zijuhu@codeaurora.org>
847+
Zijun Hu <zijun_hu@htc.com>

CREDITS

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

1400+
N: Jérôme Glisse
1401+
E: jglisse@redhat.com
1402+
D: HMM - Heterogeneous Memory Management
1403+
14001404
N: Richard E. Gooch
14011405
E: rgooch@atnf.csiro.au
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+
E: sln@onemain.com
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
E: dave.neuer@pobox.com
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+
E: masahiroy@kernel.org
4383+
D: Kbuild Maintainer 2017-2025
4384+
D: Kconfig Maintainer 2018-2025
4385+
S: Japan
4386+
43724387
N: Li Yang
43734388
E: leoli@freescale.com
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+
Contact: linux-trace-kernel@vger.kernel.org
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 <corentin.chary@gmail.com>
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+
Contact: platform-driver-x86@vger.kernel.org
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: linux-block@vger.kernel.org
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 <yi.zhang@huawei.com>
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 <yi.zhang@huawei.com>
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
Contact: linux-block@vger.kernel.org

0 commit comments

Comments
 (0)