6.12-stable patches

added patches:
	alsa-hda-realtek-fix-incorrect-is_reachable-usage.patch
	nvme-tcp-fix-a-c2htermreq-error-message.patch

diff --git a/queue-6.12/alsa-hda-realtek-fix-incorrect-is_reachable-usage.patch b/queue-6.12/alsa-hda-realtek-fix-incorrect-is_reachable-usage.patch
new file mode 100644 (file)
index 0000000..1feaf28
--- /dev/null
+++ b/queue-6.12/alsa-hda-realtek-fix-incorrect-is_reachable-usage.patch
@@ -0,0 +1,69 @@
+From d0bbe332669c5db32c8c92bc967f8e7f8d460ddf Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Tue, 4 Mar 2025 15:25:55 +0100
+Subject: ALSA: hda: realtek: fix incorrect IS_REACHABLE() usage
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+commit d0bbe332669c5db32c8c92bc967f8e7f8d460ddf upstream.
+
+The alternative path leads to a build error after a recent change:
+
+sound/pci/hda/patch_realtek.c: In function 'alc233_fixup_lenovo_low_en_micmute_led':
+include/linux/stddef.h:9:14: error: called object is not a function or function pointer
+    9 | #define NULL ((void *)0)
+      |              ^
+sound/pci/hda/patch_realtek.c:5041:49: note: in expansion of macro 'NULL'
+ 5041 | #define alc233_fixup_lenovo_line2_mic_hotkey    NULL
+      |                                                 ^~~~
+sound/pci/hda/patch_realtek.c:5063:9: note: in expansion of macro 'alc233_fixup_lenovo_line2_mic_hotkey'
+ 5063 |         alc233_fixup_lenovo_line2_mic_hotkey(codec, fix, action);
+
+Using IS_REACHABLE() is somewhat questionable here anyway since it
+leads to the input code not working when the HDA driver is builtin
+but input is in a loadable module. Replace this with a hard compile-time
+dependency on CONFIG_INPUT. In practice this won't chance much
+other than solve the compiler error because it is rare to require
+sound output but no input support.
+
+Fixes: f603b159231b ("ALSA: hda/realtek - add supported Mic Mute LED for Lenovo platform")
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Link: https://patch.msgid.link/20250304142620.582191-1-arnd@kernel.org
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/pci/hda/Kconfig         |    1 +
+ sound/pci/hda/patch_realtek.c |    5 -----
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+
+--- a/sound/pci/hda/Kconfig
++++ b/sound/pci/hda/Kconfig
+@@ -208,6 +208,7 @@ comment "Set to Y if you want auto-loadi
+ 
+ config SND_HDA_CODEC_REALTEK
+       tristate "Build Realtek HD-audio codec support"
++      depends on INPUT
+       select SND_HDA_GENERIC
+       select SND_HDA_GENERIC_LEDS
+       select SND_HDA_SCODEC_COMPONENT
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -5002,7 +5002,6 @@ static void alc298_fixup_samsung_amp_v2_
+               alc298_samsung_v2_init_amps(codec, 4);
+ }
+ 
+-#if IS_REACHABLE(CONFIG_INPUT)
+ static void gpio2_mic_hotkey_event(struct hda_codec *codec,
+                                  struct hda_jack_callback *event)
+ {
+@@ -5111,10 +5110,6 @@ static void alc233_fixup_lenovo_line2_mi
+               spec->kb_dev = NULL;
+       }
+ }
+-#else /* INPUT */
+-#define alc280_fixup_hp_gpio2_mic_hotkey      NULL
+-#define alc233_fixup_lenovo_line2_mic_hotkey  NULL
+-#endif /* INPUT */
+ 
+ static void alc269_fixup_hp_line1_mic1_led(struct hda_codec *codec,
+                               const struct hda_fixup *fix, int action)

diff --git a/queue-6.12/nvme-tcp-fix-a-c2htermreq-error-message.patch b/queue-6.12/nvme-tcp-fix-a-c2htermreq-error-message.patch
new file mode 100644 (file)
index 0000000..7928cd4
--- /dev/null
+++ b/queue-6.12/nvme-tcp-fix-a-c2htermreq-error-message.patch
@@ -0,0 +1,33 @@
+From afb41b08c44e5386f2f52fa859010ac4afd2b66f Mon Sep 17 00:00:00 2001
+From: Maurizio Lombardi <mlombard@redhat.com>
+Date: Mon, 24 Feb 2025 15:40:58 +0100
+Subject: nvme-tcp: Fix a C2HTermReq error message
+
+From: Maurizio Lombardi <mlombard@redhat.com>
+
+commit afb41b08c44e5386f2f52fa859010ac4afd2b66f upstream.
+
+In H2CTermReq, a FES with value 0x05 means "R2T Limit Exceeded"; but
+in C2HTermReq the same value has a different meaning (Data Transfer Limit
+Exceeded).
+
+Fixes: 84e009042d0f ("nvme-tcp: add basic support for the C2HTermReq PDU")
+Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
+Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
+Signed-off-by: Keith Busch <kbusch@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/nvme/host/tcp.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/nvme/host/tcp.c
++++ b/drivers/nvme/host/tcp.c
+@@ -788,7 +788,7 @@ static void nvme_tcp_handle_c2h_term(str
+               [NVME_TCP_FES_PDU_SEQ_ERR] = "PDU Sequence Error",
+               [NVME_TCP_FES_HDR_DIGEST_ERR] = "Header Digest Error",
+               [NVME_TCP_FES_DATA_OUT_OF_RANGE] = "Data Transfer Out Of Range",
+-              [NVME_TCP_FES_R2T_LIMIT_EXCEEDED] = "R2T Limit Exceeded",
++              [NVME_TCP_FES_DATA_LIMIT_EXCEEDED] = "Data Transfer Limit Exceeded",
+               [NVME_TCP_FES_UNSUPPORTED_PARAM] = "Unsupported Parameter",
+       };
+ 

diff --git a/queue-6.12/series b/queue-6.12/series
index 5e79d7e0bfd946e4138f63e25ccc33192285e743..f6f7414630fefe94a2cfde9676d267d5e8a41a1c 100644 (file)
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -256,3 +256,5 @@ arm64-hugetlb-fix-huge_ptep_get_and_clear-for-non-present-ptes.patch
 fs-netfs-read_pgpriv2-skip-folio-queues-without-marks3.patch
 fs-netfs-read_collect-fix-crash-due-to-uninitialized-prev-variable.patch
 kbuild-hdrcheck-fix-cross-build-with-clang.patch
+alsa-hda-realtek-fix-incorrect-is_reachable-usage.patch
+nvme-tcp-fix-a-c2htermreq-error-message.patch