Skip to content

Commit 3ab7ae8

Browse files
author
Thomas Hellström
committed
Merge drm/drm-next into drm-xe-next
Backmerge to bring in linux 6.15-rc. Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
2 parents 4ea5127 + b603017 commit 3ab7ae8

12,187 files changed

Lines changed: 571543 additions & 245862 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: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -690,6 +690,13 @@ ForEachMacros:
690690
- 'v4l2_m2m_for_each_src_buf'
691691
- 'v4l2_m2m_for_each_src_buf_safe'
692692
- 'virtio_device_for_each_vq'
693+
- 'vkms_config_for_each_connector'
694+
- 'vkms_config_for_each_crtc'
695+
- 'vkms_config_for_each_encoder'
696+
- 'vkms_config_for_each_plane'
697+
- 'vkms_config_connector_for_each_possible_encoder'
698+
- 'vkms_config_encoder_for_each_possible_crtc'
699+
- 'vkms_config_plane_for_each_possible_crtc'
693700
- 'while_for_each_ftrace_op'
694701
- 'xa_for_each'
695702
- 'xa_for_each_marked'

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ modules.order
6565
/vmlinux.32
6666
/vmlinux.map
6767
/vmlinux.symvers
68+
/vmlinux.unstripped
6869
/vmlinux-gdb.py
6970
/vmlinuz
7071
/System.map

.mailmap

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,13 @@ Alexander Lobakin <alobakin@pm.me> <alobakin@marvell.com>
3131
Alexander Lobakin <alobakin@pm.me> <bloodyreaper@yandex.ru>
3232
Alexander Mikhalitsyn <alexander@mihalicyn.com> <alexander.mikhalitsyn@virtuozzo.com>
3333
Alexander Mikhalitsyn <alexander@mihalicyn.com> <aleksandr.mikhalitsyn@canonical.com>
34+
Alexander Sverdlin <alexander.sverdlin@gmail.com> <alexander.sverdlin.ext@nsn.com>
35+
Alexander Sverdlin <alexander.sverdlin@gmail.com> <alexander.sverdlin@gmx.de>
36+
Alexander Sverdlin <alexander.sverdlin@gmail.com> <alexander.sverdlin@nokia.com>
37+
Alexander Sverdlin <alexander.sverdlin@gmail.com> <alexander.sverdlin@nsn.com>
38+
Alexander Sverdlin <alexander.sverdlin@gmail.com> <alexander.sverdlin@siemens.com>
39+
Alexander Sverdlin <alexander.sverdlin@gmail.com> <alexander.sverdlin@sysgo.com>
40+
Alexander Sverdlin <alexander.sverdlin@gmail.com> <subaparts@yandex.ru>
3441
Alexandre Belloni <alexandre.belloni@bootlin.com> <alexandre.belloni@free-electrons.com>
3542
Alexandre Ghiti <alex@ghiti.fr> <alexandre.ghiti@canonical.com>
3643
Alexei Avshalom Lazar <quic_ailizaro@quicinc.com> <ailizaro@codeaurora.org>
@@ -153,7 +160,6 @@ Carlos Bilbao <carlos.bilbao@kernel.org> <carlos.bilbao@amd.com>
153160
Carlos Bilbao <carlos.bilbao@kernel.org> <carlos.bilbao.osdev@gmail.com>
154161
Carlos Bilbao <carlos.bilbao@kernel.org> <bilbao@vt.edu>
155162
Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>
156-
Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>
157163
Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>
158164
Chao Yu <chao@kernel.org> <yuchao0@huawei.com>
159165
Chester Lin <chester62515@gmail.com> <clin@suse.com>
@@ -271,6 +277,7 @@ Hamza Mahfooz <hamzamahfooz@linux.microsoft.com> <hamza.mahfooz@amd.com>
271277
Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>
272278
Hans Verkuil <hverkuil@xs4all.nl> <hansverk@cisco.com>
273279
Hans Verkuil <hverkuil@xs4all.nl> <hverkuil-cisco@xs4all.nl>
280+
Harry Yoo <harry.yoo@oracle.com> <42.hyeyoo@gmail.com>
274281
Heiko Carstens <hca@linux.ibm.com> <h.carstens@de.ibm.com>
275282
Heiko Carstens <hca@linux.ibm.com> <heiko.carstens@de.ibm.com>
276283
Heiko Stuebner <heiko@sntech.de> <heiko.stuebner@bqreaders.com>
@@ -282,6 +289,7 @@ Henrik Rydberg <rydberg@bitmath.org>
282289
Herbert Xu <herbert@gondor.apana.org.au>
283290
Huacai Chen <chenhuacai@kernel.org> <chenhc@lemote.com>
284291
Huacai Chen <chenhuacai@kernel.org> <chenhuacai@loongson.cn>
292+
Ike Panhc <ikepanhc@gmail.com> <ike.pan@canonical.com>
285293
J. Bruce Fields <bfields@fieldses.org> <bfields@redhat.com>
286294
J. Bruce Fields <bfields@fieldses.org> <bfields@citi.umich.edu>
287295
Jacob Shin <Jacob.Shin@amd.com>
@@ -304,7 +312,6 @@ Jan Glauber <jan.glauber@gmail.com> <jglauber@cavium.com>
304312
Jan Kuliga <jtkuliga.kdev@gmail.com> <jankul@alatek.krakow.pl>
305313
Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@linux.intel.com>
306314
Jarkko Sakkinen <jarkko@kernel.org> <jarkko@profian.com>
307-
Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@parity.io>
308315
Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>
309316
Jason Gunthorpe <jgg@ziepe.ca> <jgg@nvidia.com>
310317
Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
@@ -542,6 +549,8 @@ Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org>
542549
Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>
543550
Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.de>
544551
Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.com>
552+
Nicolas Schier <nicolas.schier@linux.dev> <n.schier@avm.de>
553+
Nicolas Schier <nicolas.schier@linux.dev> <nicolas@fjasle.eu>
545554
Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
546555
Nikolay Aleksandrov <razor@blackwall.org> <naleksan@redhat.com>
547556
Nikolay Aleksandrov <razor@blackwall.org> <nikolay@redhat.com>
@@ -686,6 +695,8 @@ Stephen Hemminger <stephen@networkplumber.org> <shemminger@linux-foundation.org>
686695
Stephen Hemminger <stephen@networkplumber.org> <shemminger@osdl.org>
687696
Stephen Hemminger <stephen@networkplumber.org> <sthemmin@microsoft.com>
688697
Stephen Hemminger <stephen@networkplumber.org> <sthemmin@vyatta.com>
698+
Stephen Smalley <stephen.smalley.work@gmail.com> <sds@epoch.ncsc.mil>
699+
Stephen Smalley <stephen.smalley.work@gmail.com> <sds@tycho.nsa.gov>
689700
Steve Wise <larrystevenwise@gmail.com> <swise@chelsio.com>
690701
Steve Wise <larrystevenwise@gmail.com> <swise@opengridcomputing.com>
691702
Subash Abhinov Kasiviswanathan <quic_subashab@quicinc.com> <subashab@codeaurora.org>
@@ -759,7 +770,6 @@ Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org>
759770
Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>
760771
Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>
761772
Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>
762-
Viresh Kumar <viresh.kumar@linaro.org> <viresh.kumar@linaro.org>
763773
Viresh Kumar <viresh.kumar@linaro.org> <viresh.kumar@linaro.com>
764774
Vishnu Dasa <vishnu.dasa@broadcom.com> <vdasa@vmware.com>
765775
Vivek Aknurwar <quic_viveka@quicinc.com> <viveka@codeaurora.org>

CREDITS

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,10 @@ S: Code 930.5, Goddard Space Flight Center
317317
S: Greenbelt, Maryland 20771
318318
S: USA
319319

320+
N: Joel Becker
321+
E: jlbec@evilplan.org
322+
D: configfs
323+
320324
N: Adam Belay
321325
E: ambx1@neo.rr.com
322326
D: Linux Plug and Play Support
@@ -855,6 +859,10 @@ N: John Crispin
855859
E: john@phrozen.org
856860
D: MediaTek MT7623 Gigabit ethernet support
857861

862+
N: Conor Culhane
863+
E: conor.culhane@silvaco.com
864+
D: Silvaco I3C master driver
865+
858866
N: Laurence Culhane
859867
E: loz@holmes.demon.co.uk
860868
D: Wrote the initial alpha SLIP code
@@ -1895,6 +1903,7 @@ S: Czech Republic
18951903
N: Seth Jennings
18961904
E: sjenning@redhat.com
18971905
D: Creation and maintenance of zswap
1906+
D: Creation and maintenace of the zbud allocator
18981907

18991908
N: Jeremy Kerr
19001909
D: Maintainer of SPU File System
@@ -2187,6 +2196,10 @@ D: Various ACPI fixes, keeping correct battery state through suspend
21872196
D: various lockdep annotations, autofs and other random bugfixes
21882197
S: Prague, Czech Republic
21892198

2199+
N: Ishizaki Kou
2200+
E: kou.ishizaki@toshiba.co.jp
2201+
D: Spidernet driver for PowerPC Cell platforms
2202+
21902203
N: Gene Kozin
21912204
E: 74604.152@compuserve.com
21922205
W: https://www.sangoma.com
@@ -2197,6 +2210,9 @@ S: Markham, Ontario
21972210
S: L3R 8B2
21982211
S: Canada
21992212

2213+
N: Christian Krafft
2214+
D: PowerPC Cell support
2215+
22002216
N: Maxim Krasnyansky
22012217
E: maxk@qualcomm.com
22022218
W: http://vtun.sf.net
@@ -2389,6 +2405,10 @@ S: ICP vortex GmbH
23892405
S: Neckarsulm
23902406
S: Germany
23912407

2408+
N: Geoff Levand
2409+
E: geoff@infradead.org
2410+
D: Spidernet driver for PowerPC Cell platforms
2411+
23922412
N: Phil Lewis
23932413
E: beans@bucket.ualr.edu
23942414
D: Promised to send money if I would put his name in the source tree.
@@ -3233,6 +3253,10 @@ N: Rui Prior
32333253
E: rprior@inescn.pt
32343254
D: ATM device driver for NICStAR based cards
32353255

3256+
N: Roopa Prabhu
3257+
E: roopa@nvidia.com
3258+
D: Bridge co-maintainer, vxlan and networking contributor
3259+
32363260
N: Stefan Probst
32373261
E: sp@caldera.de
32383262
D: The Linux Support Team Erlangen, 1993-97
@@ -3646,6 +3670,10 @@ S: 149 Union St.
36463670
S: Kingston, Ontario
36473671
S: Canada K7L 2P4
36483672

3673+
N: Pravin B Shelar
3674+
E: pshelar@ovn.org
3675+
D: Open vSwitch maintenance and contributions
3676+
36493677
N: John Shifflett
36503678
E: john@geolog.com
36513679
E: jshiffle@netcom.com
@@ -3788,6 +3816,7 @@ N: Dan Streetman
37883816
E: ddstreet@ieee.org
37893817
D: Maintenance and development of zswap
37903818
D: Creation and maintenance of the zpool API
3819+
D: Maintenace of the zbud allocator
37913820

37923821
N: Drew Sullivan
37933822
E: drew@ss.org
@@ -4315,6 +4344,7 @@ S: England
43154344
N: Vitaly Wool
43164345
E: vitaly.wool@konsulko.com
43174346
D: Maintenance and development of zswap
4347+
D: Maintenance and development of z3fold
43184348

43194349
N: Chris Wright
43204350
E: chrisw@sous-sol.org

Documentation/ABI/README

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
This directory attempts to document the ABI between the Linux kernel and
1+
This part of the documentation inside Documentation/ABI directory
2+
attempts to document the ABI between the Linux kernel and
23
userspace, and the relative stability of these interfaces. Due to the
34
everchanging nature of Linux, and the differing maturity levels, these
45
interfaces should be used by userspace programs in different ways.

0 commit comments

Comments
 (0)