Skip to content

Commit 1260ed7

Browse files
author
Thomas Zimmermann
committed
Merge drm/drm-fixes into drm-misc-fixes
Backmerging to get updates from v6.15-rc1. Signed-off-by: Thomas Zimmermann <[email protected]>
2 parents 7fb6afa + 0af2f6b commit 1260ed7

File tree

18,107 files changed

+1079279
-406240
lines changed

Some content is hidden

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

18,107 files changed

+1079279
-406240
lines changed

.clippy.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22

3+
msrv = "1.78.0"
4+
35
check-private-items = true
46

57
disallowed-macros = [

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
*.dtb.S
2323
*.dtbo.S
2424
*.dwo
25+
*.dylib
2526
*.elf
2627
*.gcno
2728
*.gcda
@@ -64,6 +65,7 @@ modules.order
6465
/vmlinux.32
6566
/vmlinux.map
6667
/vmlinux.symvers
68+
/vmlinux.unstripped
6769
/vmlinux-gdb.py
6870
/vmlinuz
6971
/System.map

.mailmap

Lines changed: 57 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,13 @@ Alexander Lobakin <[email protected]> <[email protected]>
3131
3232
Alexander Mikhalitsyn <[email protected]> <[email protected]>
3333
Alexander Mikhalitsyn <[email protected]> <[email protected]>
34+
Alexander Sverdlin <[email protected]> <[email protected]>
35+
Alexander Sverdlin <[email protected]> <[email protected]>
36+
Alexander Sverdlin <[email protected]> <[email protected]>
37+
Alexander Sverdlin <[email protected]> <[email protected]>
38+
Alexander Sverdlin <[email protected]> <[email protected]>
39+
Alexander Sverdlin <[email protected]> <[email protected]>
40+
Alexander Sverdlin <[email protected]> <[email protected]>
3441
3542
3643
Alexei Avshalom Lazar <[email protected]> <[email protected]>
@@ -83,6 +90,12 @@ Anirudh Ghayal <[email protected]> <[email protected]>
8390
8491
8592
93+
94+
95+
96+
97+
98+
8699
87100
Archit Taneja <[email protected]>
88101
@@ -135,15 +148,18 @@ Boris Brezillon <[email protected]> <[email protected]>
135148
136149
137150
Brian Avery <[email protected]>
151+
152+
138153
Brian King <[email protected]>
139154
140155
141156
142157
143158
144-
159+
160+
161+
145162
146-
147163
148164
149165
@@ -158,6 +174,7 @@ Christian Brauner <[email protected]> <[email protected]>
158174
159175
Christian Marangi <[email protected]>
160176
Christophe Ricard <[email protected]>
177+
Christopher Obbard <[email protected]> <[email protected]>
161178
Christoph Hellwig <[email protected]>
162179
163180
@@ -188,10 +205,11 @@ Dengcheng Zhu <[email protected]> <[email protected]>
188205
189206
190207
191-
Dmitry Baryshkov <[email protected]>
192-
Dmitry Baryshkov <[email protected]> <[[email protected]]>
193-
194-
208+
209+
Dmitry Baryshkov <[email protected]> <[[email protected]]>
210+
211+
212+
195213
196214
197215
@@ -214,6 +232,7 @@ Fangrui Song <[email protected]> <[email protected]>
214232
Felipe W Damasio <[email protected]>
215233
Felix Kuhling <[email protected]>
216234
Felix Moeller <[email protected]>
235+
217236
218237
Filipe Lautert <[email protected]>
219238
@@ -254,9 +273,11 @@ Guo Ren <[email protected]> <[email protected]>
254273
Guru Das Srinagesh <[email protected]> <[email protected]>
255274
Gustavo Padovan <[email protected]>
256275
Gustavo Padovan <[email protected]>
276+
257277
258278
259279
280+
260281
261282
262283
@@ -268,6 +289,7 @@ Henrik Rydberg <[email protected]>
268289
Herbert Xu <[email protected]>
269290
270291
292+
271293
272294
273295
Jacob Shin <[email protected]>
@@ -290,7 +312,6 @@ Jan Glauber <[email protected]> <[email protected]>
290312
291313
292314
293-
294315
295316
296317
@@ -304,10 +325,13 @@ Jayachandran C <[email protected]> <[email protected]>
304325
Jean Tourrilhes <[email protected]>
305326
306327
Jeff Garzik <[email protected]>
328+
329+
307330
308331
309332
310-
333+
334+
311335
312336
313337
@@ -363,6 +387,7 @@ Juha Yrjola <[email protected]>
363387
364388
365389
390+
366391
367392
Karthikeyan Periyasamy <[email protected]> <[email protected]>
368393
@@ -408,6 +433,7 @@ Liam Mark <[email protected]> <[email protected]>
408433
Linas Vepstas <[email protected]>
409434
410435
436+
411437
412438
413439
@@ -430,6 +456,8 @@ Marcin Nowakowski <[email protected]> <[email protected]>
430456
431457
432458
Marek Behún <[email protected]> Marek Behun <[email protected]>
459+
460+
433461
Mark Brown <[email protected]>
434462
435463
Markus Schneider-Pargmann <[email protected]> <[email protected]>
@@ -515,11 +543,14 @@ Nicholas Piggin <[email protected]> <[email protected]>
515543
516544
517545
546+
518547
519548
520549
521550
Nicolas Saenz Julienne <[email protected]> <[email protected]>
522551
Nicolas Saenz Julienne <[email protected]> <[email protected]>
552+
553+
523554
Niklas Söderlund <[email protected]>
524555
Nikolay Aleksandrov <[email protected]> <[email protected]>
525556
Nikolay Aleksandrov <[email protected]> <[email protected]>
@@ -533,6 +564,8 @@ Oleksij Rempel <[email protected]> <[email protected]>
533564
534565
Oleksij Rempel <[email protected]>
535566
567+
568+
536569
537570
538571
@@ -591,6 +624,8 @@ Richard Leitner <[email protected]> <[email protected]>
591624
592625
593626
627+
628+
594629
595630
596631
@@ -644,6 +679,11 @@ Simona Vetter <[email protected]> <[email protected]>
644679
645680
646681
Simon Kelley <[email protected]>
682+
683+
684+
685+
686+
647687
Sricharan Ramabadhran <[email protected]> <[email protected]>
648688
649689
@@ -655,15 +695,23 @@ Stephen Hemminger <[email protected]> <[email protected]>
655695
656696
657697
698+
699+
658700
659701
660702
Subash Abhinov Kasiviswanathan <[email protected]> <[email protected]>
661703
Subbaraman Narayanamurthy <[email protected]> <[email protected]>
662704
Subhash Jadavani <[email protected]>
663705
Sudarshan Rajagopalan <[email protected]> <[email protected]>
664706
Sudeep Holla <[email protected]> Sudeep KarkadaNagesha <[email protected]>
707+
665708
Sumit Semwal <[email protected]>
666709
710+
711+
712+
713+
714+
667715
Takashi YOSHII <[email protected]>
668716
Tamizh Chelvam Raja <[email protected]> <[email protected]>
669717
@@ -722,7 +770,6 @@ Vinod Koul <[email protected]> <[email protected]>
722770
723771
724772
725-
726773
727774
728775
@@ -740,6 +787,7 @@ Wolfram Sang <[email protected]> <[email protected]>
740787
741788
742789
790+
743791
Yusuke Goda <[email protected]>
744792
745793

CREDITS

Lines changed: 37 additions & 5 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+
322+
D: configfs
323+
320324
N: Adam Belay
321325
322326
D: Linux Plug and Play Support
@@ -855,6 +859,10 @@ N: John Crispin
855859
856860
D: MediaTek MT7623 Gigabit ethernet support
857861

862+
N: Conor Culhane
863+
864+
D: Silvaco I3C master driver
865+
858866
N: Laurence Culhane
859867
860868
D: Wrote the initial alpha SLIP code
@@ -1895,6 +1903,7 @@ S: Czech Republic
18951903
N: Seth Jennings
18961904
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+
2201+
D: Spidernet driver for PowerPC Cell platforms
2202+
21902203
N: Gene Kozin
21912204
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
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+
2410+
D: Spidernet driver for PowerPC Cell platforms
2411+
23922412
N: Phil Lewis
23932413
23942414
D: Promised to send money if I would put his name in the source tree.
@@ -2515,11 +2535,9 @@ D: SLS distribution
25152535
D: Initial implementation of VC's, pty's and select()
25162536

25172537
N: Pavel Machek
2518-
E: pavel@ucw.cz
2538+
E: pavel@kernel.org
25192539
P: 4096R/92DFCE96 4FA7 9EEF FCD4 C44F C585 B8C7 C060 2241 92DF CE96
2520-
D: Softcursor for vga, hypertech cdrom support, vcsa bugfix, nbd,
2521-
D: sun4/330 port, capabilities for elf, speedup for rm on ext2, USB,
2522-
D: work on suspend-to-ram/disk, killing duplicates from ioctl32,
2540+
D: NBD, Sun4/330 port, USB, work on suspend-to-ram/disk,
25232541
D: Altera SoCFPGA and Nokia N900 support.
25242542
S: Czech Republic
25252543

@@ -3235,6 +3253,10 @@ N: Rui Prior
32353253
32363254
D: ATM device driver for NICStAR based cards
32373255

3256+
N: Roopa Prabhu
3257+
3258+
D: Bridge co-maintainer, vxlan and networking contributor
3259+
32383260
N: Stefan Probst
32393261
32403262
D: The Linux Support Team Erlangen, 1993-97
@@ -3648,6 +3670,10 @@ S: 149 Union St.
36483670
S: Kingston, Ontario
36493671
S: Canada K7L 2P4
36503672

3673+
N: Pravin B Shelar
3674+
3675+
D: Open vSwitch maintenance and contributions
3676+
36513677
N: John Shifflett
36523678
36533679
@@ -3790,6 +3816,7 @@ N: Dan Streetman
37903816
37913817
D: Maintenance and development of zswap
37923818
D: Creation and maintenance of the zpool API
3819+
D: Maintenace of the zbud allocator
37933820

37943821
N: Drew Sullivan
37953822
@@ -3948,6 +3975,10 @@ S: 1 Amherst Street
39483975
S: Cambridge, Massachusetts 02139
39493976
S: USA
39503977

3978+
N: Luben Tuikov
3979+
E: Luben Tuikov <[email protected]>
3980+
D: Maintainer of the DRM GPU Scheduler
3981+
39513982
N: Simmule Turner
39523983
39533984
D: Added swapping to filesystem
@@ -4313,6 +4344,7 @@ S: England
43134344
N: Vitaly Wool
43144345
43154346
D: Maintenance and development of zswap
4347+
D: Maintenance and development of z3fold
43164348

43174349
N: Chris Wright
43184350
@@ -4339,7 +4371,7 @@ D: Freescale Highspeed USB device driver
43394371
D: Freescale QE SoC support and Ethernet driver
43404372
S: B-1206 Jingmao Guojigongyu
43414373
S: 16 Baliqiao Nanjie, Beijing 101100
4342-
S: People's Repulic of China
4374+
S: People's Republic of China
43434375

43444376
N: Vlad Yasevich
43454377

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)