]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
6.1-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 17 Jun 2025 11:36:28 +0000 (13:36 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 17 Jun 2025 11:36:28 +0000 (13:36 +0200)
added patches:
alsa-usb-audio-add-implicit-feedback-quirk-for-rode-ai-1.patch
tools-resolve_btfids-fix-build-when-cross-compiling-kernel-with-clang.patch

queue-6.1/alsa-usb-audio-add-implicit-feedback-quirk-for-rode-ai-1.patch [new file with mode: 0644]
queue-6.1/series
queue-6.1/tools-resolve_btfids-fix-build-when-cross-compiling-kernel-with-clang.patch [new file with mode: 0644]

diff --git a/queue-6.1/alsa-usb-audio-add-implicit-feedback-quirk-for-rode-ai-1.patch b/queue-6.1/alsa-usb-audio-add-implicit-feedback-quirk-for-rode-ai-1.patch
new file mode 100644 (file)
index 0000000..614c1c9
--- /dev/null
@@ -0,0 +1,34 @@
+From 6a3439a417b910e662c666993798e0691bc81147 Mon Sep 17 00:00:00 2001
+From: David Heimann <d@dmeh.net>
+Date: Sun, 1 Jun 2025 12:41:16 -0400
+Subject: ALSA: usb-audio: Add implicit feedback quirk for RODE AI-1
+
+From: David Heimann <d@dmeh.net>
+
+commit 6a3439a417b910e662c666993798e0691bc81147 upstream.
+
+The RODE AI-1 audio interface requires implicit feedback sync between
+playback endpoint 0x03 and feedback endpoint 0x84 on interface 3, but
+doesn't advertise this in its USB descriptors.
+
+Without this quirk, the device receives audio data but produces no output.
+
+Signed-off-by: David Heimann <d@dmeh.net>
+Cc: <stable@vger.kernel.org>
+Link: https://patch.msgid.link/084dc88c-1193-4a94-a002-5599adff936c@app.fastmail.com
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/usb/implicit.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sound/usb/implicit.c
++++ b/sound/usb/implicit.c
+@@ -57,6 +57,7 @@ static const struct snd_usb_implicit_fb_
+       IMPLICIT_FB_FIXED_DEV(0x31e9, 0x0002, 0x81, 2), /* Solid State Logic SSL2+ */
+       IMPLICIT_FB_FIXED_DEV(0x0499, 0x172f, 0x81, 2), /* Steinberg UR22C */
+       IMPLICIT_FB_FIXED_DEV(0x0d9a, 0x00df, 0x81, 2), /* RTX6001 */
++      IMPLICIT_FB_FIXED_DEV(0x19f7, 0x000a, 0x84, 3), /* RODE AI-1 */
+       IMPLICIT_FB_FIXED_DEV(0x22f0, 0x0006, 0x81, 3), /* Allen&Heath Qu-16 */
+       IMPLICIT_FB_FIXED_DEV(0x1686, 0xf029, 0x82, 2), /* Zoom UAC-2 */
+       IMPLICIT_FB_FIXED_DEV(0x2466, 0x8003, 0x86, 2), /* Fractal Audio Axe-Fx II */
index b18300bb370a2a355b500ea2782bdfaa657b6417..12a43569418a97f9434e9679f97157768868894f 100644 (file)
@@ -273,3 +273,5 @@ fs-filesystems-fix-potential-unsigned-integer-underf.patch
 nvmet-fcloop-access-fcpreq-only-when-holding-reqlock.patch
 perf-ensure-bpf_perf_link-path-is-properly-serialize.patch
 bio-fix-bio_first_folio-for-sparsemem-without-vmemma.patch
+tools-resolve_btfids-fix-build-when-cross-compiling-kernel-with-clang.patch
+alsa-usb-audio-add-implicit-feedback-quirk-for-rode-ai-1.patch
diff --git a/queue-6.1/tools-resolve_btfids-fix-build-when-cross-compiling-kernel-with-clang.patch b/queue-6.1/tools-resolve_btfids-fix-build-when-cross-compiling-kernel-with-clang.patch
new file mode 100644 (file)
index 0000000..1bd0621
--- /dev/null
@@ -0,0 +1,39 @@
+From a298bbab903e3fb4cbe16d36d6195e68fad1b776 Mon Sep 17 00:00:00 2001
+From: Suleiman Souhlal <suleiman@google.com>
+Date: Fri, 6 Jun 2025 16:45:38 +0900
+Subject: tools/resolve_btfids: Fix build when cross compiling kernel with clang.
+
+From: Suleiman Souhlal <suleiman@google.com>
+
+commit a298bbab903e3fb4cbe16d36d6195e68fad1b776 upstream.
+
+When cross compiling the kernel with clang, we need to override
+CLANG_CROSS_FLAGS when preparing the step libraries.
+
+Prior to commit d1d096312176 ("tools: fix annoying "mkdir -p ..." logs
+when building tools in parallel"), MAKEFLAGS would have been set to a
+value that wouldn't set a value for CLANG_CROSS_FLAGS, hiding the
+fact that we weren't properly overriding it.
+
+Fixes: 56a2df7615fa ("tools/resolve_btfids: Compile resolve_btfids as host program")
+Signed-off-by: Suleiman Souhlal <suleiman@google.com>
+Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
+Acked-by: Jiri Olsa <jolsa@kernel.org>
+Cc: stable@vger.kernel.org
+Link: https://lore.kernel.org/bpf/20250606074538.1608546-1-suleiman@google.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/bpf/resolve_btfids/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/tools/bpf/resolve_btfids/Makefile
++++ b/tools/bpf/resolve_btfids/Makefile
+@@ -19,7 +19,7 @@ endif
+ # Overrides for the prepare step libraries.
+ HOST_OVERRIDES := AR="$(HOSTAR)" CC="$(HOSTCC)" LD="$(HOSTLD)" ARCH="$(HOSTARCH)" \
+-                CROSS_COMPILE="" EXTRA_CFLAGS="$(HOSTCFLAGS)"
++                CROSS_COMPILE="" CLANG_CROSS_FLAGS="" EXTRA_CFLAGS="$(HOSTCFLAGS)"
+ RM      ?= rm
+ HOSTCC  ?= gcc