Skip to content

Commit 5add3c3

Browse files
author
Thomas Hellström
committed
Merge drm/drm-next into drm-xe-next
Backmerging to bring in 6.19-rc1. An important upstream bugfix and to help unblock PTL CI. Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
2 parents c7b83a9 + 8f0b4cc commit 5add3c3

10,899 files changed

Lines changed: 583826 additions & 206101 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: 3 additions & 2 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'
@@ -415,6 +415,7 @@ ForEachMacros:
415415
- 'for_each_prop_dlc_cpus'
416416
- 'for_each_prop_dlc_platforms'
417417
- 'for_each_property_of_node'
418+
- 'for_each_pt_level_entry'
418419
- 'for_each_rdt_resource'
419420
- 'for_each_reg'
420421
- 'for_each_reg_filtered'

.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: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,9 @@ Christian Brauner <brauner@kernel.org> <christian@brauner.io>
186186
Christian Brauner <brauner@kernel.org> <christian.brauner@canonical.com>
187187
Christian Brauner <brauner@kernel.org> <christian.brauner@ubuntu.com>
188188
Christian Marangi <ansuelsmth@gmail.com>
189+
Christophe Leroy <chleroy@kernel.org> <christophe.leroy@c-s.fr>
190+
Christophe Leroy <chleroy@kernel.org> <christophe.leroy@csgroup.eu>
191+
Christophe Leroy <chleroy@kernel.org> <christophe.leroy2@cs-soprasteria.com>
189192
Christophe Ricard <christophe.ricard@gmail.com>
190193
Christopher Obbard <christopher.obbard@linaro.org> <chris.obbard@collabora.com>
191194
Christoph Hellwig <hch@lst.de>
@@ -300,6 +303,7 @@ Hans de Goede <hansg@kernel.org> <hdegoede@redhat.com>
300303
Hans Verkuil <hverkuil@kernel.org> <hverkuil@xs4all.nl>
301304
Hans Verkuil <hverkuil@kernel.org> <hverkuil-cisco@xs4all.nl>
302305
Hans Verkuil <hverkuil@kernel.org> <hansverk@cisco.com>
306+
Hao Ge <hao.ge@linux.dev> <gehao@kylinos.cn>
303307
Harry Yoo <harry.yoo@oracle.com> <42.hyeyoo@gmail.com>
304308
Heiko Carstens <hca@linux.ibm.com> <h.carstens@de.ibm.com>
305309
Heiko Carstens <hca@linux.ibm.com> <heiko.carstens@de.ibm.com>
@@ -345,7 +349,8 @@ Jayachandran C <c.jayachandran@gmail.com> <jayachandranc@netlogicmicro.com>
345349
Jayachandran C <c.jayachandran@gmail.com> <jchandra@broadcom.com>
346350
Jayachandran C <c.jayachandran@gmail.com> <jchandra@digeo.com>
347351
Jayachandran C <c.jayachandran@gmail.com> <jnair@caviumnetworks.com>
348-
<jean-philippe@linaro.org> <jean-philippe.brucker@arm.com>
352+
Jean-Philippe Brucker <jpb@kernel.org> <jean-philippe.brucker@arm.com>
353+
Jean-Philippe Brucker <jpb@kernel.org> <jean-philippe@linaro.org>
349354
Jean-Michel Hautbois <jeanmichel.hautbois@yoseli.org> <jeanmichel.hautbois@ideasonboard.com>
350355
Jean Tourrilhes <jt@hpl.hp.com>
351356
Jeevan Shriram <quic_jshriram@quicinc.com> <jshriram@codeaurora.org>
@@ -439,6 +444,7 @@ Krishna Manikandan <quic_mkrishn@quicinc.com> <mkrishn@codeaurora.org>
439444
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
440445
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
441446
Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@canonical.com>
447+
Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@linaro.org>
442448
Krzysztof Wilczyński <kwilczynski@kernel.org> <krzysztof.wilczynski@linux.com>
443449
Krzysztof Wilczyński <kwilczynski@kernel.org> <kw@linux.com>
444450
Kshitiz Godara <quic_kgodara@quicinc.com> <kgodara@codeaurora.org>
@@ -499,9 +505,7 @@ Mark Brown <broonie@sirena.org.uk>
499505
Mark Starovoytov <mstarovo@pm.me> <mstarovoitov@marvell.com>
500506
Markus Schneider-Pargmann <msp@baylibre.com> <mpa@pengutronix.de>
501507
Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>
502-
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>
503-
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@puri.sm>
504-
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>
508+
Martin Kepplinger-Novakovic <martink@posteo.de> <martin.kepplinger-novakovic@ginzinger.com>
505509
Martyna Szapar-Mudlaw <martyna.szapar-mudlaw@linux.intel.com> <martyna.szapar-mudlaw@intel.com>
506510
Mathieu Othacehe <othacehe@gnu.org> <m.othacehe@gmail.com>
507511
Mat Martineau <martineau@kernel.org> <mathew.j.martineau@linux.intel.com>
@@ -590,8 +594,8 @@ Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org>
590594
Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>
591595
Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.de>
592596
Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.com>
593-
Nicolas Schier <nicolas.schier@linux.dev> <n.schier@avm.de>
594-
Nicolas Schier <nicolas.schier@linux.dev> <nicolas@fjasle.eu>
597+
Nicolas Schier <nsc@kernel.org> <n.schier@avm.de>
598+
Nicolas Schier <nsc@kernel.org> <nicolas@fjasle.eu>
595599
Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
596600
Nikolay Aleksandrov <razor@blackwall.org> <naleksan@redhat.com>
597601
Nikolay Aleksandrov <razor@blackwall.org> <nikolay@redhat.com>
@@ -638,6 +642,7 @@ Peter Oruba <peter.oruba@amd.com>
638642
Peter Oruba <peter@oruba.de>
639643
Pierre-Louis Bossart <pierre-louis.bossart@linux.dev> <pierre-louis.bossart@linux.intel.com>
640644
Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>
645+
Pratyush Yadav <pratyush@kernel.org> <ptyadav@amazon.de>
641646
Praveen BP <praveenbp@ti.com>
642647
Pradeep Kumar Chitrapu <quic_pradeepc@quicinc.com> <pradeepc@codeaurora.org>
643648
Prasad Sodagudi <quic_psodagud@quicinc.com> <psodagud@codeaurora.org>
@@ -692,7 +697,10 @@ Sachin Mokashi <sachin.mokashi@intel.com> <sachinx.mokashi@intel.com>
692697
Sachin P Sant <ssant@in.ibm.com>
693698
Sai Prakash Ranjan <quic_saipraka@quicinc.com> <saiprakash.ranjan@codeaurora.org>
694699
Sakari Ailus <sakari.ailus@linux.intel.com> <sakari.ailus@iki.fi>
700+
Sam Protsenko <semen.protsenko@linaro.org>
701+
Sam Protsenko <semen.protsenko@linaro.org> <semen.protsenko@globallogic.com>
695702
Sam Ravnborg <sam@mars.ravnborg.org>
703+
Samuel Kayode <samkay014@gmail.com> <samuel.kayode@savoirfairelinux.com>
696704
Sankeerth Billakanti <quic_sbillaka@quicinc.com> <sbillaka@codeaurora.org>
697705
Santosh Shilimkar <santosh.shilimkar@oracle.org>
698706
Santosh Shilimkar <ssantosh@kernel.org>
@@ -848,6 +856,9 @@ Vivien Didelot <vivien.didelot@gmail.com> <vivien.didelot@savoirfairelinux.com>
848856
Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com>
849857
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
850858
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>
859+
WangYuli <wangyuli@aosc.io> <wangyl5933@chinaunicom.cn>
860+
WangYuli <wangyuli@aosc.io> <wangyuli@deepin.org>
861+
WangYuli <wangyuli@aosc.io> <wangyuli@uniontech.com>
851862
Weiwen Hu <huweiwen@linux.alibaba.com> <sehuww@mail.scut.edu.cn>
852863
WeiXiong Liao <gmpy.liaowx@gmail.com> <liaoweixiong@allwinnertech.com>
853864
Wen Gong <quic_wgong@quicinc.com> <wgong@codeaurora.org>
@@ -859,6 +870,7 @@ Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
859870
Yanteng Si <si.yanteng@linux.dev> <siyanteng@loongson.cn>
860871
Ying Huang <huang.ying.caritas@gmail.com> <ying.huang@intel.com>
861872
Yosry Ahmed <yosry.ahmed@linux.dev> <yosryahmed@google.com>
873+
Yu-Chun Lin <eleanor.lin@realtek.com> <eleanor15x@gmail.com>
862874
Yusuke Goda <goda.yusuke@renesas.com>
863875
Zack Rusin <zack.rusin@broadcom.com> <zackr@vmware.com>
864876
Zhu Yanjun <zyjzyj2000@gmail.com> <yanjunz@nvidia.com>

.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: 8 additions & 5 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+
E: kishon@kernel.org
21+
D: Generic Phy Framework
22+
1923
N: Thomas Abraham
2024
E: thomas.ab@samsung.com
2125
D: Samsung pin controller driver
@@ -2056,16 +2060,15 @@ S: Korte Heul 95
20562060
S: 1403 ND BUSSUM
20572061
S: The Netherlands
20582062

2059-
N: Martin Kepplinger
2063+
N: Martin Kepplinger-Novakovic
20602064
E: martink@posteo.de
2061-
E: martin.kepplinger@puri.sm
2062-
W: http://www.martinkepplinger.com
20632065
P: 4096R/5AB387D3 F208 2B88 0F9E 4239 3468 6E3F 5003 98DF 5AB3 87D3
20642066
D: mma8452 accelerators iio driver
20652067
D: pegasus_notetaker input driver
2068+
D: imx8m media and hi846 sensor driver
20662069
D: Kernel fixes and cleanups
2067-
S: Garnisonstraße 26
2068-
S: 4020 Linz
2070+
S: Keplerstr. 6
2071+
S: 4050 Traun
20692072
S: Austria
20702073

20712074
N: Karl Keyte
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+
Contact: kexec@lists.infradead.org
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+
Contact: kexec@lists.infradead.org
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+
Contact: kexec@lists.infradead.org
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+
Contact: kexec@lists.infradead.org
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+
Contact: kexec@lists.infradead.org
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/testing/ima_policy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ Description:
2020
rule format: action [condition ...]
2121

2222
action: measure | dont_measure | appraise | dont_appraise |
23-
audit | hash | dont_hash
23+
audit | dont_audit | hash | dont_hash
2424
condition:= base | lsm [option]
2525
base: [[func=] [mask=] [fsmagic=] [fsuuid=] [fsname=]
26+
[fs_subtype=]
2627
[uid=] [euid=] [gid=] [egid=]
2728
[fowner=] [fgroup=]]
2829
lsm: [[subj_user=] [subj_role=] [subj_type=]

Documentation/ABI/testing/rtc-cdev

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Description:
1414
for RTCs that support alarms
1515

1616
* RTC_ALM_READ, RTC_ALM_SET: Read or set the alarm time for
17-
RTCs that support alarms. Can be set upto 24 hours in the
17+
RTCs that support alarms. Can be set up to 24 hours in the
1818
future. Requires a separate RTC_AIE_ON call to enable the
1919
alarm interrupt. (Prefer to use RTC_WKALM_*)
2020

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
What: /sys/.../message
2+
Date: October 2021
3+
KernelVersion: 5.16
4+
Description:
5+
Controls the text message displayed on character line displays.
6+
7+
Reading returns the current message with a trailing newline.
8+
Writing updates the displayed message. Messages longer than the
9+
display width will automatically scroll. Trailing newlines in
10+
input are automatically trimmed.
11+
12+
Writing an empty string clears the display.
13+
14+
Example:
15+
echo "Hello World" > message
16+
cat message # Returns "Hello World\n"
17+
18+
What: /sys/.../num_chars
19+
Date: November 2025
20+
KernelVersion: 6.18
21+
Contact: Jean-François Lessard <jefflessard3@gmail.com>
22+
Description:
23+
Read-only attribute showing the character width capacity of
24+
the line display device. Messages longer than this will scroll.
25+
26+
Example:
27+
cat num_chars # Returns "16\n" for 16-char display
28+
29+
What: /sys/.../scroll_step_ms
30+
Date: October 2021
31+
KernelVersion: 5.16
32+
Description:
33+
Controls the scrolling speed for messages longer than the display
34+
width, specified in milliseconds per scroll step.
35+
36+
Setting to 0 disables scrolling. Default is 500ms.
37+
38+
Example:
39+
echo "250" > scroll_step_ms # 4Hz scrolling
40+
cat scroll_step_ms # Returns "250\n"
41+
42+
What: /sys/.../map_seg7
43+
Date: January 2024
44+
KernelVersion: 6.9
45+
Description:
46+
Read/write binary blob representing the ASCII-to-7-segment
47+
display conversion table used by the linedisp driver, as defined
48+
by struct seg7_conversion_map in <linux/map_to_7segment.h>.
49+
50+
Only visible on displays with 7-segment capability.
51+
52+
This attribute is not human-readable. Writes must match the
53+
struct size exactly, else -EINVAL is returned; reads return the
54+
entire mapping as a binary blob.
55+
56+
This interface and its implementation match existing conventions
57+
used in segment-mapped display drivers since 2005.
58+
59+
ABI note: This style of binary sysfs attribute *is an exception*
60+
to current "one value per file, text only" sysfs rules, for
61+
historical compatibility and driver uniformity. New drivers are
62+
discouraged from introducing additional binary sysfs ABIs.
63+
64+
Reference interface guidance:
65+
- include/uapi/linux/map_to_7segment.h
66+
67+
What: /sys/.../map_seg14
68+
Date: January 2024
69+
KernelVersion: 6.9
70+
Description:
71+
Read/write binary blob representing the ASCII-to-14-segment
72+
display conversion table used by the linedisp driver, as defined
73+
by struct seg14_conversion_map in <linux/map_to_14segment.h>.
74+
75+
Only visible on displays with 14-segment capability.
76+
77+
This attribute is not human-readable. Writes must match the
78+
struct size exactly, else -EINVAL is returned; reads return the
79+
entire mapping as a binary blob.
80+
81+
This interface and its implementation match existing conventions
82+
used by segment-mapped display drivers since 2005.
83+
84+
ABI note: This style of binary sysfs attribute *is an exception*
85+
to current "one value per file, text only" sysfs rules, for
86+
historical compatibility and driver uniformity. New drivers are
87+
discouraged from introducing additional binary sysfs ABIs.
88+
89+
Reference interface guidance:
90+
- include/uapi/linux/map_to_14segment.h

Documentation/ABI/testing/sysfs-block-bcache

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,6 @@ Description:
106106
will be discarded from the cache. Should not be turned off with
107107
writeback caching enabled.
108108

109-
What: /sys/block/<disk>/bcache/discard
110-
Date: November 2010
111-
Contact: Kent Overstreet <kent.overstreet@gmail.com>
112-
Description:
113-
For a cache, a boolean allowing discard/TRIM to be turned off
114-
or back on if the device supports it.
115-
116109
What: /sys/block/<disk>/bcache/bucket_size
117110
Date: November 2010
118111
Contact: Kent Overstreet <kent.overstreet@gmail.com>

0 commit comments

Comments
 (0)