Skip to content

Commit ec2e0fb

Browse files
committed
Merge tag 'asoc-fix-v6.18-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.18 A moderately large collection of driver specific fixes, plus a few new quirks and device IDs. The NAU8821 changes are a little large but more in mechanical ways than in ways that are complex.
2 parents c6fceaf + f1a450f commit ec2e0fb

File tree

11,775 files changed

+547847
-317632
lines changed

Some content is hidden

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

11,775 files changed

+547847
-317632
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'

.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: 15 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
@@ -623,6 +627,7 @@ Paulo Alcantara <[email protected]> <[email protected]>
623627
624628
Pavankumar Kondeti <[email protected]> <[email protected]>
625629
Peter A Jonsson <[email protected]>
630+
626631
Peter Oruba <[email protected]>
627632
Peter Oruba <[email protected]>
628633
Pierre-Louis Bossart <[email protected]> <[email protected]>
@@ -706,6 +711,7 @@ Sergey Senozhatsky <[email protected]> <[email protected]>
706711
Sergey Senozhatsky <[email protected]> <[email protected]>
707712
708713
714+
709715
710716
711717
@@ -716,7 +722,8 @@ Shuah Khan <[email protected]> <[email protected]>
716722
717723
718724
719-
725+
726+
720727
721728
722729
@@ -740,6 +747,8 @@ Sriram Yagnaraman <[email protected]> <[email protected]>
740747
Stanislav Fomichev <[email protected]> <[email protected]>
741748
Stanislav Fomichev <[email protected]> <[email protected]>
742749
750+
Stéphane Grosjean <[email protected]> <[email protected]>
751+
Stéphane Grosjean <[email protected]> <[email protected]>
743752
Stéphane Witzmann <[email protected]>
744753
745754
@@ -794,6 +803,7 @@ Tvrtko Ursulin <[email protected]> <[email protected]>
794803
795804
796805
806+
797807
Uwe Kleine-König <[email protected]>
798808
799809
Uwe Kleine-König <[email protected]>
@@ -815,7 +825,9 @@ Valentin Schneider <[email protected]> <[email protected]>
815825
Veera Sundaram Sankaran <[email protected]> <[email protected]>
816826
Veerabhadrarao Badiganti <[email protected]> <[email protected]>
817827
Venkateswara Naralasetty <[email protected]> <[email protected]>
818-
828+
829+
830+
819831
820832
821833

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