Skip to content

Commit c34e9ab

Browse files
committed
Merge tag 'asoc-fix-v6.13-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.13 A few small fixes for v6.13, all system specific - the biggest thing is the fix for jack handling over suspend on some Intel laptops.
2 parents 20c3b3e + ec16a3c commit c34e9ab

File tree

13,312 files changed

+516218
-343468
lines changed

Some content is hidden

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

13,312 files changed

+516218
-343468
lines changed

.clippy.toml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
3+
check-private-items = true
4+
5+
disallowed-macros = [
6+
# The `clippy::dbg_macro` lint only works with `std::dbg!`, thus we simulate
7+
# it here, see: https://github.com/rust-lang/rust-clippy/issues/11303.
8+
{ path = "kernel::dbg", reason = "the `dbg!` macro is intended as a debugging tool" },
9+
]

.get_maintainer.ignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ Alan Cox <root@hraefn.swansea.linux.org.uk>
33
Christoph Hellwig <hch@lst.de>
44
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
55
Marc Gonzalez <marc.w.gonzalez@free.fr>
6+
Ralf Baechle <ralf@linux-mips.org>

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ modules.order
103103
# We don't want to ignore the following even if they are dot-files
104104
#
105105
!.clang-format
106+
!.clippy.toml
106107
!.cocciconfig
107108
!.editorconfig
108109
!.get_maintainer.ignore
@@ -128,6 +129,7 @@ series
128129

129130
# ctags files
130131
tags
132+
!tags/
131133
TAGS
132134

133135
# cscope files

.mailmap

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ Alexei Avshalom Lazar <quic_ailizaro@quicinc.com> <ailizaro@codeaurora.org>
3737
Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
3838
Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
3939
Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>
40+
Alexey Klimov <alexey.klimov@linaro.org> <klimov.linux@gmail.com>
4041
Alexey Makhalov <alexey.amakhalov@broadcom.com> <amakhalov@vmware.com>
4142
Alex Elder <elder@kernel.org>
4243
Alex Elder <elder@kernel.org> <aelder@sgi.com>
@@ -251,6 +252,8 @@ Guru Das Srinagesh <quic_gurus@quicinc.com> <gurus@codeaurora.org>
251252
Gustavo Padovan <gustavo@las.ic.unicamp.br>
252253
Gustavo Padovan <padovan@profusion.mobi>
253254
Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>
255+
Hans Verkuil <hverkuil@xs4all.nl> <hansverk@cisco.com>
256+
Hans Verkuil <hverkuil@xs4all.nl> <hverkuil-cisco@xs4all.nl>
254257
Heiko Carstens <hca@linux.ibm.com> <h.carstens@de.ibm.com>
255258
Heiko Carstens <hca@linux.ibm.com> <heiko.carstens@de.ibm.com>
256259
Heiko Stuebner <heiko@sntech.de> <heiko.stuebner@bqreaders.com>
@@ -269,6 +272,7 @@ Jack Pham <quic_jackp@quicinc.com> <jackp@codeaurora.org>
269272
Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@google.com>
270273
Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk.kim@samsung.com>
271274
Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@motorola.com>
275+
Jai Luthra <jai.luthra@linux.dev> <j-luthra@ti.com>
272276
Jakub Kicinski <kuba@kernel.org> <jakub.kicinski@netronome.com>
273277
James Bottomley <jejb@mulgrave.(none)>
274278
James Bottomley <jejb@titanic.il.steeleye.com>
@@ -730,6 +734,7 @@ Will Deacon <will@kernel.org> <will.deacon@arm.com>
730734
Wolfram Sang <wsa@kernel.org> <w.sang@pengutronix.de>
731735
Wolfram Sang <wsa@kernel.org> <wsa@the-dreams.de>
732736
Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
737+
Yanteng Si <si.yanteng@linux.dev> <siyanteng@loongson.cn>
733738
Yusuke Goda <goda.yusuke@renesas.com>
734739
Zack Rusin <zack.rusin@broadcom.com> <zackr@vmware.com>
735740
Zhu Yanjun <zyjzyj2000@gmail.com> <yanjunz@nvidia.com>

CREDITS

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,11 @@ P: 1024/AF7B30C1 CF 97 C2 CC 6D AE A7 FE C8 BA 9C FC 88 DE 32 C3
185185
D: Linux/MIPS port
186186
D: Linux/68k hacker
187187
D: AX25 maintainer
188+
D: EDAC-CAVIUM OCTEON maintainer
189+
D: IOC3 ETHERNET DRIVER maintainer
190+
D: NETROM NETWORK LAYER maintainer
191+
D: ROSE NETWORK LAYER maintainer
192+
D: TURBOCHANNEL SUBSYSTEM maintainer
188193
S: Hauptstrasse 19
189194
S: 79837 St. Blasien
190195
S: Germany
@@ -574,6 +579,9 @@ N: Zach Brown
574579
E: zab@zabbo.net
575580
D: maestro pci sound
576581

582+
N: Zefan Li
583+
D: Contribution to control group stuff
584+
577585
N: David Brownell
578586
D: Kernel engineer, mentor, and friend. Maintained USB EHCI and
579587
D: gadget layers, SPI subsystem, GPIO subsystem, and more than a few
@@ -3795,6 +3803,10 @@ S: Department of Zoology, University of Washington
37953803
S: Seattle, WA 98195-1800
37963804
S: USA
37973805

3806+
N: York Sun
3807+
E: york.sun@nxp.com
3808+
D: Freescale DDR EDAC
3809+
37983810
N: Eugene Surovegin
37993811
E: ebs@ebshome.net
38003812
W: https://kernel.ebshome.net/
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
What: /sys/fs/selinux/user
2+
Date: April 2005 (predates git)
3+
KernelVersion: 2.6.12-rc2 (predates git)
4+
Contact: selinux@vger.kernel.org
5+
Description:
6+
7+
The selinuxfs "user" node allows userspace to request a list
8+
of security contexts that can be reached for a given SELinux
9+
user from a given starting context. This was used by libselinux
10+
when various login-style programs requested contexts for
11+
users, but libselinux stopped using it in 2020.
12+
Kernel support will be removed no sooner than Dec 2025.

Documentation/ABI/stable/sysfs-block

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,13 @@ Description:
424424
[RW] This file is used to control (on/off) the iostats
425425
accounting of the disk.
426426

427+
What: /sys/block/<disk>/queue/iostats_passthrough
428+
Date: October 2024
429+
Contact: linux-block@vger.kernel.org
430+
Description:
431+
[RW] This file is used to control (on/off) the iostats
432+
accounting of the disk for passthrough commands.
433+
427434

428435
What: /sys/block/<disk>/queue/logical_block_size
429436
Date: May 2009
@@ -594,6 +601,9 @@ Description:
594601
[RW] Maximum number of kilobytes to read-ahead for filesystems
595602
on this block device.
596603

604+
For MADV_HUGEPAGE, the readahead size may exceed this setting
605+
since its granularity is based on the hugepage size.
606+
597607

598608
What: /sys/block/<disk>/queue/rotational
599609
Date: January 2009

Documentation/ABI/testing/configfs-usb-gadget-uvc

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,70 @@ Description: Specific uncompressed frame descriptors
342342
support
343343
========================= =====================================
344344

345+
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/framebased
346+
Date: Sept 2024
347+
KernelVersion: 5.15
348+
Description: Framebased format descriptors
349+
350+
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/framebased/name
351+
Date: Sept 2024
352+
KernelVersion: 5.15
353+
Description: Specific framebased format descriptors
354+
355+
================== =======================================
356+
bFormatIndex unique id for this format descriptor;
357+
only defined after parent header is
358+
linked into the streaming class;
359+
read-only
360+
bmaControls this format's data for bmaControls in
361+
the streaming header
362+
bmInterlaceFlags specifies interlace information,
363+
read-only
364+
bAspectRatioY the X dimension of the picture aspect
365+
ratio, read-only
366+
bAspectRatioX the Y dimension of the picture aspect
367+
ratio, read-only
368+
bDefaultFrameIndex optimum frame index for this stream
369+
bBitsPerPixel number of bits per pixel used to
370+
specify color in the decoded video
371+
frame
372+
guidFormat globally unique id used to identify
373+
stream-encoding format
374+
================== =======================================
375+
376+
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/framebased/name/name
377+
Date: Sept 2024
378+
KernelVersion: 5.15
379+
Description: Specific framebased frame descriptors
380+
381+
========================= =====================================
382+
bFrameIndex unique id for this framedescriptor;
383+
only defined after parent format is
384+
linked into the streaming header;
385+
read-only
386+
dwFrameInterval indicates how frame interval can be
387+
programmed; a number of values
388+
separated by newline can be specified
389+
dwDefaultFrameInterval the frame interval the device would
390+
like to use as default
391+
dwBytesPerLine Specifies the number of bytes per line
392+
of video for packed fixed frame size
393+
formats, allowing the receiver to
394+
perform stride alignment of the video.
395+
If the bVariableSize value (above) is
396+
TRUE (1), or if the format does not
397+
permit such alignment, this value shall
398+
be set to zero (0).
399+
dwMaxBitRate the maximum bit rate at the shortest
400+
frame interval in bps
401+
dwMinBitRate the minimum bit rate at the longest
402+
frame interval in bps
403+
wHeight height of decoded bitmap frame in px
404+
wWidth width of decoded bitmam frame in px
405+
bmCapabilities still image support, fixed frame-rate
406+
support
407+
========================= =====================================
408+
345409
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/header
346410
Date: Dec 2014
347411
KernelVersion: 4.0

Documentation/ABI/testing/debugfs-hisi-hpre

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,3 +184,10 @@ Date: Apr 2020
184184
Contact: linux-crypto@vger.kernel.org
185185
Description: Dump the total number of time out requests.
186186
Available for both PF and VF, and take no other effect on HPRE.
187+
188+
What: /sys/kernel/debug/hisi_hpre/<bdf>/cap_regs
189+
Date: Oct 2024
190+
Contact: linux-crypto@vger.kernel.org
191+
Description: Dump the values of the qm and hpre capability bit registers and
192+
support the query of device specifications to facilitate fault locating.
193+
Available for both PF and VF, and take no other effect on HPRE.
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
What: /sys/kernel/debug/vfio/<device>/migration/hisi_acc/dev_data
2+
Date: Jan 2025
3+
KernelVersion: 6.13
4+
Contact: Longfang Liu <liulongfang@huawei.com>
5+
Description: Read the configuration data and some status data
6+
required for device live migration. These data include device
7+
status data, queue configuration data, some task configuration
8+
data and device attribute data. The output format of the data
9+
is defined by the live migration driver.
10+
11+
What: /sys/kernel/debug/vfio/<device>/migration/hisi_acc/migf_data
12+
Date: Jan 2025
13+
KernelVersion: 6.13
14+
Contact: Longfang Liu <liulongfang@huawei.com>
15+
Description: Read the data from the last completed live migration.
16+
This data includes the same device status data as in "dev_data".
17+
The migf_data is the dev_data that is migrated.
18+
19+
What: /sys/kernel/debug/vfio/<device>/migration/hisi_acc/cmd_state
20+
Date: Jan 2025
21+
KernelVersion: 6.13
22+
Contact: Longfang Liu <liulongfang@huawei.com>
23+
Description: Used to obtain the device command sending and receiving
24+
channel status. Returns failure or success logs based on the
25+
results.

0 commit comments

Comments
 (0)