Skip to content

Commit 1f17cc1

Browse files
Automatic merge of 'fixes-test' into merge-test (2025-10-13 10:24)
2 parents a3cc5ab + 0843ba4 commit 1f17cc1

File tree

12,144 files changed

+568212
-332541
lines changed

Some content is hidden

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

12,144 files changed

+568212
-332541
lines changed

.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'

.gitignore

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

179179
# Clang's compilation database file
180-
/compile_commands.json
180+
compile_commands.json
181181

182182
# Documentation toolchain
183183
sphinx_*/

.mailmap

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,8 @@ Casey Connolly <[email protected]> <[email protected]>
165165
166166
167167
168+
169+
168170
169171
170172
@@ -214,7 +216,8 @@ Dengcheng Zhu <[email protected]> <[email protected]>
214216
215217
216218
217-
219+
220+
218221
219222
Dmitry Baryshkov <[email protected]> <[[email protected]]>
220223
@@ -708,6 +711,7 @@ Sergey Senozhatsky <[email protected]> <[email protected]>
708711
Sergey Senozhatsky <[email protected]> <[email protected]>
709712
710713
714+
711715
712716
713717
@@ -718,7 +722,8 @@ Shuah Khan <[email protected]> <[email protected]>
718722
719723
720724
721-
725+
726+
722727
723728
724729
@@ -742,6 +747,8 @@ Sriram Yagnaraman <[email protected]> <[email protected]>
742747
Stanislav Fomichev <[email protected]> <[email protected]>
743748
Stanislav Fomichev <[email protected]> <[email protected]>
744749
750+
Stéphane Grosjean <[email protected]> <[email protected]>
751+
Stéphane Grosjean <[email protected]> <[email protected]>
745752
Stéphane Witzmann <[email protected]>
746753
747754
@@ -796,6 +803,7 @@ Tvrtko Ursulin <[email protected]> <[email protected]>
796803
797804
798805
806+
799807
Uwe Kleine-König <[email protected]>
800808
801809
Uwe Kleine-König <[email protected]>
@@ -817,7 +825,9 @@ Valentin Schneider <[email protected]> <[email protected]>
817825
Veera Sundaram Sankaran <[email protected]> <[email protected]>
818826
Veerabhadrarao Badiganti <[email protected]> <[email protected]>
819827
Venkateswara Naralasetty <[email protected]> <[email protected]>
820-
828+
829+
830+
821831
822832
823833

.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: 11 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
@@ -3912,6 +3917,12 @@ S: C/ Federico Garcia Lorca 1 10-A
39123917
S: Sevilla 41005
39133918
S: Spain
39143919

3920+
N: Björn Töpel
3921+
3922+
D: AF_XDP
3923+
S: Gothenburg
3924+
S: Sweden
3925+
39153926
N: Linus Torvalds
39163927
39173928
D: Original kernel hacker

0 commit comments

Comments
 (0)