Skip to content

Commit f39b6c4

Browse files
committed
Merge tag 'v6.18-rc6' into for-linus
Sync up with the mainline to bring in definition of INPUT_PROP_HAPTIC_TOUCHPAD.
2 parents e08969c + 6a23ae0 commit f39b6c4

13,508 files changed

Lines changed: 598649 additions & 346113 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: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Alan Cox <[email protected]>
2727
2828
Aleksandar Markovic <[email protected]> <[email protected]>
2929
Aleksey Gorelov <[email protected]>
30+
3031
3132
3233
@@ -134,6 +135,7 @@ Ben M Cahill <[email protected]>
134135
135136
136137
138+
137139
138140
Benjamin Tissoires <[email protected]> <[email protected]>
139141
Benjamin Tissoires <[email protected]> <[email protected]>
@@ -164,6 +166,8 @@ Casey Connolly <[email protected]> <[email protected]>
164166
165167
166168
169+
170+
167171
168172
169173
@@ -202,6 +206,7 @@ Danilo Krummrich <[email protected]> <[email protected]>
202206
David Brownell <[email protected]>
203207
204208
209+
205210
206211
207212
@@ -213,7 +218,8 @@ Dengcheng Zhu <[email protected]> <[email protected]>
213218
214219
215220
216-
221+
222+
217223
218224
Dmitry Baryshkov <[email protected]> <[[email protected]]>
219225
@@ -223,9 +229,12 @@ Dmitry Safonov <[email protected]> <[email protected]>
223229
224230
225231
Domen Puncer <[email protected]>
232+
226233
Douglas Gilbert <[email protected]>
227234
228235
236+
237+
229238
Ed L. Cashin <[email protected]>
230239
231240
Enric Balletbo i Serra <[email protected]> <[email protected]>
@@ -418,7 +427,7 @@ Kenneth W Chen <[email protected]>
418427
419428
420429
421-
Kirill A. Shutemov <[email protected]> <[email protected]>
430+
422431
Kishon Vijay Abraham I <[email protected]> <[email protected]>
423432
424433
@@ -587,6 +596,7 @@ Nikolay Aleksandrov <[email protected]> <[email protected]>
587596
Nikolay Aleksandrov <[email protected]> <[email protected]>
588597
Nikolay Aleksandrov <[email protected]> <[email protected]>
589598
Nikolay Aleksandrov <[email protected]> <[email protected]>
599+
590600
591601
Oleksandr Natalenko <[email protected]> <[email protected]>
592602
@@ -596,7 +606,8 @@ Oleksij Rempel <[email protected]>
596606
597607
598608
599-
609+
610+
600611
601612
602613
@@ -620,6 +631,7 @@ Paulo Alcantara <[email protected]> <[email protected]>
620631
621632
Pavankumar Kondeti <[email protected]> <[email protected]>
622633
Peter A Jonsson <[email protected]>
634+
623635
Peter Oruba <[email protected]>
624636
Peter Oruba <[email protected]>
625637
Pierre-Louis Bossart <[email protected]> <[email protected]>
@@ -634,6 +646,7 @@ Qais Yousef <[email protected]> <[email protected]>
634646
635647
636648
649+
637650
638651
639652
@@ -703,6 +716,7 @@ Sergey Senozhatsky <[email protected]> <[email protected]>
703716
Sergey Senozhatsky <[email protected]> <[email protected]>
704717
705718
719+
706720
707721
708722
@@ -713,7 +727,8 @@ Shuah Khan <[email protected]> <[email protected]>
713727
714728
715729
716-
730+
731+
717732
718733
719734
@@ -737,6 +752,8 @@ Sriram Yagnaraman <[email protected]> <[email protected]>
737752
Stanislav Fomichev <[email protected]> <[email protected]>
738753
Stanislav Fomichev <[email protected]> <[email protected]>
739754
755+
Stéphane Grosjean <[email protected]> <[email protected]>
756+
Stéphane Grosjean <[email protected]> <[email protected]>
740757
Stéphane Witzmann <[email protected]>
741758
742759
@@ -791,6 +808,7 @@ Tvrtko Ursulin <[email protected]> <[email protected]>
791808
792809
793810
811+
794812
Uwe Kleine-König <[email protected]>
795813
796814
Uwe Kleine-König <[email protected]>
@@ -812,7 +830,9 @@ Valentin Schneider <[email protected]> <[email protected]>
812830
Veera Sundaram Sankaran <[email protected]> <[email protected]>
813831
Veerabhadrarao Badiganti <[email protected]> <[email protected]>
814832
Venkateswara Naralasetty <[email protected]> <[email protected]>
815-
833+
834+
835+
816836
817837
818838

.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: 22 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
@@ -2031,6 +2036,10 @@ S: Botanicka' 68a
20312036
S: 602 00 Brno
20322037
S: Czech Republic
20332038

2039+
N: Karsten Keil
2040+
2041+
D: ISDN subsystem maintainer
2042+
20342043
N: Jakob Kemi
20352044
20362045
D: V4L W9966 Webcam driver
@@ -3222,6 +3231,10 @@ D: AIC5800 IEEE 1394, RAW I/O on 1394
32223231
D: Starter of Linux1394 effort
32233232
S: ask per mail for current address
32243233

3234+
N: Boris Pismenny
3235+
3236+
D: Kernel TLS implementation and offload support.
3237+
32253238
N: Nicolas Pitre
32263239
32273240
D: StrongARM SA1100 support integrator & hacker
@@ -3908,6 +3921,12 @@ S: C/ Federico Garcia Lorca 1 10-A
39083921
S: Sevilla 41005
39093922
S: Spain
39103923

3924+
N: Björn Töpel
3925+
3926+
D: AF_XDP
3927+
S: Gothenburg
3928+
S: Sweden
3929+
39113930
N: Linus Torvalds
39123931
39133932
D: Original kernel hacker
@@ -4168,6 +4187,9 @@ S: 1513 Brewster Dr.
41684187
S: Carrollton, TX 75010
41694188
S: USA
41704189

4190+
N: Dave Watson
4191+
D: Kernel TLS implementation.
4192+
41714193
N: Tim Waugh
41724194
41734195
D: Co-architect of the parallel-port sharing system

0 commit comments

Comments
 (0)