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
Alan Cox <alan@lxorguk.ukuu.org.uk>
22
Alan Cox <root@hraefn.swansea.linux.org.uk>
3+
Alyssa Rosenzweig <alyssa@rosenzweig.io>
34
Christoph Hellwig <hch@lst.de>
45
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
56
Marc Gonzalez <marc.w.gonzalez@free.fr>

.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 <ben.m.cahill@intel.com>
134134
Ben Widawsky <bwidawsk@kernel.org> <ben@bwidawsk.net>
135135
Ben Widawsky <bwidawsk@kernel.org> <ben.widawsky@intel.com>
136136
Ben Widawsky <bwidawsk@kernel.org> <benjamin.widawsky@intel.com>
137+
Bence Csókás <bence98@sch.bme.hu> <csokas.bence@prolan.hu>
137138
Benjamin Poirier <benjamin.poirier@gmail.com> <bpoirier@suse.de>
138139
Benjamin Tissoires <bentiss@kernel.org> <benjamin.tissoires@gmail.com>
139140
Benjamin Tissoires <bentiss@kernel.org> <benjamin.tissoires@redhat.com>
@@ -164,6 +165,8 @@ Casey Connolly <casey.connolly@linaro.org> <caleb@connolly.tech>
164165
Casey Connolly <casey.connolly@linaro.org> <caleb@postmarketos.org>
165166
Can Guo <quic_cang@quicinc.com> <cang@codeaurora.org>
166167
Carl Huang <quic_cjhuang@quicinc.com> <cjhuang@codeaurora.org>
168+
Carl Vanderlip <carl.vanderlip@oss.qualcomm.com> <carlv@codeaurora.org>
169+
Carl Vanderlip <carl.vanderlip@oss.qualcomm.com> <quic_carlv@quicinc.com>
167170
Carlos Bilbao <carlos.bilbao@kernel.org> <carlos.bilbao@amd.com>
168171
Carlos Bilbao <carlos.bilbao@kernel.org> <carlos.bilbao.osdev@gmail.com>
169172
Carlos Bilbao <carlos.bilbao@kernel.org> <bilbao@vt.edu>
@@ -213,7 +216,8 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com>
213216
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>
214217
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>
215218
<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>
216-
Dikshita Agarwal <quic_dikshita@quicinc.com> <dikshita@codeaurora.org>
219+
Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com> <dikshita@codeaurora.org>
220+
Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com> <quic_dikshita@quicinc.com>
217221
Dmitry Baryshkov <lumag@kernel.org> <dbaryshkov@gmail.com>
218222
Dmitry Baryshkov <lumag@kernel.org> <[dbaryshkov@gmail.com]>
219223
Dmitry Baryshkov <lumag@kernel.org> <dmitry_baryshkov@mentor.com>
@@ -623,6 +627,7 @@ Paulo Alcantara <pc@manguebit.org> <palcantara@suse.com>
623627
Paulo Alcantara <pc@manguebit.org> <pc@manguebit.com>
624628
Pavankumar Kondeti <quic_pkondeti@quicinc.com> <pkondeti@codeaurora.org>
625629
Peter A Jonsson <pj@ludd.ltu.se>
630+
Peter Hilber <peter.hilber@oss.qualcomm.com> <quic_philber@quicinc.com>
626631
Peter Oruba <peter.oruba@amd.com>
627632
Peter Oruba <peter@oruba.de>
628633
Pierre-Louis Bossart <pierre-louis.bossart@linux.dev> <pierre-louis.bossart@linux.intel.com>
@@ -706,6 +711,7 @@ Sergey Senozhatsky <senozhatsky@chromium.org> <sergey.senozhatsky@mail.by>
706711
Sergey Senozhatsky <senozhatsky@chromium.org> <senozhatsky@google.com>
707712
Seth Forshee <sforshee@kernel.org> <seth.forshee@canonical.com>
708713
Shakeel Butt <shakeel.butt@linux.dev> <shakeelb@google.com>
714+
Shameer Kolothum <skolothumtho@nvidia.com> <shameerali.kolothum.thodi@huawei.com>
709715
Shannon Nelson <sln@onemain.com> <shannon.nelson@amd.com>
710716
Shannon Nelson <sln@onemain.com> <snelson@pensando.io>
711717
Shannon Nelson <sln@onemain.com> <shannon.nelson@intel.com>
@@ -716,7 +722,8 @@ Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>
716722
Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>
717723
Shuah Khan <shuah@kernel.org> <shuahkh@osg.samsung.com>
718724
Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>
719-
Sibi Sankar <quic_sibis@quicinc.com> <sibis@codeaurora.org>
725+
Sibi Sankar <sibi.sankar@oss.qualcomm.com> <sibis@codeaurora.org>
726+
Sibi Sankar <sibi.sankar@oss.qualcomm.com> <quic_sibis@quicinc.com>
720727
Sid Manning <quic_sidneym@quicinc.com> <sidneym@codeaurora.org>
721728
Simon Arlott <simon@octiron.net> <simon@fire.lp0.eu>
722729
Simona Vetter <simona.vetter@ffwll.ch> <daniel.vetter@ffwll.ch>
@@ -740,6 +747,8 @@ Sriram Yagnaraman <sriram.yagnaraman@ericsson.com> <sriram.yagnaraman@est.tech>
740747
Stanislav Fomichev <sdf@fomichev.me> <sdf@google.com>
741748
Stanislav Fomichev <sdf@fomichev.me> <stfomichev@gmail.com>
742749
Stefan Wahren <wahrenst@gmx.net> <stefan.wahren@i2se.com>
750+
Stéphane Grosjean <stephane.grosjean@hms-networks.com> <s.grosjean@peak-system.com>
751+
Stéphane Grosjean <stephane.grosjean@hms-networks.com> <stephane.grosjean@free.fr>
743752
Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
744753
Stephen Hemminger <stephen@networkplumber.org> <shemminger@linux-foundation.org>
745754
Stephen Hemminger <stephen@networkplumber.org> <shemminger@osdl.org>
@@ -794,6 +803,7 @@ Tvrtko Ursulin <tursulin@ursulin.net> <tvrtko.ursulin@onelan.co.uk>
794803
Tvrtko Ursulin <tursulin@ursulin.net> <tvrtko@ursulin.net>
795804
Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>
796805
Tzung-Bi Shih <tzungbi@kernel.org> <tzungbi@google.com>
806+
Umang Jain <uajain@igalia.com> <umang.jain@ideasonboard.com>
797807
Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
798808
Uwe Kleine-König <u.kleine-koenig@baylibre.com> <ukleinek@baylibre.com>
799809
Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
@@ -815,7 +825,9 @@ Valentin Schneider <vschneid@redhat.com> <valentin.schneider@arm.com>
815825
Veera Sundaram Sankaran <quic_veeras@quicinc.com> <veeras@codeaurora.org>
816826
Veerabhadrarao Badiganti <quic_vbadigan@quicinc.com> <vbadigan@codeaurora.org>
817827
Venkateswara Naralasetty <quic_vnaralas@quicinc.com> <vnaralas@codeaurora.org>
818-
Vikash Garodia <quic_vgarodia@quicinc.com> <vgarodia@codeaurora.org>
828+
Vikash Garodia <vikash.garodia@oss.qualcomm.com> <vgarodia@codeaurora.org>
829+
Vikash Garodia <vikash.garodia@oss.qualcomm.com> <quic_vgarodia@quicinc.com>
830+
Vincent Mailhol <mailhol@kernel.org> <mailhol.vincent@wanadoo.fr>
819831
Vinod Koul <vkoul@kernel.org> <vinod.koul@intel.com>
820832
Vinod Koul <vkoul@kernel.org> <vinod.koul@linux.intel.com>
821833
Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org>

.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+
E: michael.jamet@intel.com
1895+
D: Thunderbolt/USB4 driver maintainer
1896+
D: Thunderbolt/USB4 networking driver maintainer
1897+
18931898
N: Dave Jeffery
18941899
E: dhjeffery@gmail.com
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+
E: bjorn@kernel.org
3922+
D: AF_XDP
3923+
S: Gothenburg
3924+
S: Sweden
3925+
39153926
N: Linus Torvalds
39163927
E: torvalds@linux-foundation.org
39173928
D: Original kernel hacker

0 commit comments

Comments
 (0)