Skip to content

Commit 48a7107

Browse files
committed
Merge drm/drm-fixes into drm-misc-fixes
Updating drm-misc-fixes to the state of v6.18-rc1. Signed-off-by: Thomas Zimmermann <[email protected]>
2 parents 7f38a14 + 3a86608 commit 48a7107

13,011 files changed

Lines changed: 588671 additions & 340518 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: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,6 @@ ForEachMacros:
294294
- 'for_each_fib6_node_rt_rcu'
295295
- 'for_each_fib6_walker_rt'
296296
- 'for_each_file_lock'
297-
- 'for_each_free_mem_pfn_range_in_zone_from'
298297
- 'for_each_free_mem_range'
299298
- 'for_each_free_mem_range_reverse'
300299
- 'for_each_func_rsrc'

.get_maintainer.ignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
22
3+
Alyssa Rosenzweig <[email protected]>
34
Christoph Hellwig <[email protected]>
45
Jeff Kirsher <[email protected]>
56
Marc Gonzalez <[email protected]>

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ x509.genkey
176176
*.kdev4
177177

178178
# Clang's compilation database file
179-
/compile_commands.json
179+
compile_commands.json
180180

181181
# Documentation toolchain
182182
sphinx_*/

.mailmap

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ Ben M Cahill <[email protected]>
134134
135135
136136
137+
137138
138139
Benjamin Tissoires <[email protected]> <[email protected]>
139140
Benjamin Tissoires <[email protected]> <[email protected]>
@@ -164,6 +165,8 @@ Casey Connolly <[email protected]> <[email protected]>
164165
165166
166167
168+
169+
167170
168171
169172
@@ -213,7 +216,8 @@ Dengcheng Zhu <[email protected]> <[email protected]>
213216
214217
215218
216-
219+
220+
217221
218222
Dmitry Baryshkov <[email protected]> <[[email protected]]>
219223
@@ -226,6 +230,8 @@ Domen Puncer <[email protected]>
226230
Douglas Gilbert <[email protected]>
227231
228232
233+
234+
229235
Ed L. Cashin <[email protected]>
230236
231237
Enric Balletbo i Serra <[email protected]> <[email protected]>
@@ -587,6 +593,7 @@ Nikolay Aleksandrov <[email protected]> <[email protected]>
587593
Nikolay Aleksandrov <[email protected]> <[email protected]>
588594
Nikolay Aleksandrov <[email protected]> <[email protected]>
589595
Nikolay Aleksandrov <[email protected]> <[email protected]>
596+
590597
591598
Oleksandr Natalenko <[email protected]> <[email protected]>
592599
@@ -620,6 +627,7 @@ Paulo Alcantara <[email protected]> <[email protected]>
620627
621628
Pavankumar Kondeti <[email protected]> <[email protected]>
622629
Peter A Jonsson <[email protected]>
630+
623631
Peter Oruba <[email protected]>
624632
Peter Oruba <[email protected]>
625633
Pierre-Louis Bossart <[email protected]> <[email protected]>
@@ -703,6 +711,7 @@ Sergey Senozhatsky <[email protected]> <[email protected]>
703711
Sergey Senozhatsky <[email protected]> <[email protected]>
704712
705713
714+
706715
707716
708717
@@ -713,7 +722,8 @@ Shuah Khan <[email protected]> <[email protected]>
713722
714723
715724
716-
725+
726+
717727
718728
719729
@@ -737,6 +747,8 @@ Sriram Yagnaraman <[email protected]> <[email protected]>
737747
Stanislav Fomichev <[email protected]> <[email protected]>
738748
Stanislav Fomichev <[email protected]> <[email protected]>
739749
750+
Stéphane Grosjean <[email protected]> <[email protected]>
751+
Stéphane Grosjean <[email protected]> <[email protected]>
740752
Stéphane Witzmann <[email protected]>
741753
742754
@@ -791,6 +803,7 @@ Tvrtko Ursulin <[email protected]> <[email protected]>
791803
792804
793805
806+
794807
Uwe Kleine-König <[email protected]>
795808
796809
Uwe Kleine-König <[email protected]>
@@ -812,7 +825,9 @@ Valentin Schneider <[email protected]> <[email protected]>
812825
Veera Sundaram Sankaran <[email protected]> <[email protected]>
813826
Veerabhadrarao Badiganti <[email protected]> <[email protected]>
814827
Venkateswara Naralasetty <[email protected]> <[email protected]>
815-
828+
829+
830+
816831
817832
818833

.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"]'
2+
init-hook='import sys; sys.path += ["scripts/lib/kdoc", "scripts/lib/abi", "tools/docs/lib"]'

CREDITS

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1890,6 +1890,11 @@ S: Reading
18901890
S: RG6 2NU
18911891
S: United Kingdom
18921892

1893+
N: Michael Jamet
1894+
1895+
D: Thunderbolt/USB4 driver maintainer
1896+
D: Thunderbolt/USB4 networking driver maintainer
1897+
18931898
N: Dave Jeffery
18941899
18951900
D: SCSI hacks and IBM ServeRAID RAID driver maintenance
@@ -3222,6 +3227,10 @@ D: AIC5800 IEEE 1394, RAW I/O on 1394
32223227
D: Starter of Linux1394 effort
32233228
S: ask per mail for current address
32243229

3230+
N: Boris Pismenny
3231+
3232+
D: Kernel TLS implementation and offload support.
3233+
32253234
N: Nicolas Pitre
32263235
32273236
D: StrongARM SA1100 support integrator & hacker
@@ -3908,6 +3917,12 @@ S: C/ Federico Garcia Lorca 1 10-A
39083917
S: Sevilla 41005
39093918
S: Spain
39103919

3920+
N: Björn Töpel
3921+
3922+
D: AF_XDP
3923+
S: Gothenburg
3924+
S: Sweden
3925+
39113926
N: Linus Torvalds
39123927
39133928
D: Original kernel hacker
@@ -4168,6 +4183,9 @@ S: 1513 Brewster Dr.
41684183
S: Carrollton, TX 75010
41694184
S: USA
41704185

4186+
N: Dave Watson
4187+
D: Kernel TLS implementation.
4188+
41714189
N: Tim Waugh
41724190
41734191
D: Co-architect of the parallel-port sharing system

0 commit comments

Comments
 (0)