5.15-stable patches

added patches:
	alsa-hda-realtek-really-fix-headset-mic-for-tongfang-x6ar55xu.patch
	nvmet-tcp-pass-iov_len-instead-of-sg-length-to-bvec_set_page.patch

diff --git a/queue-5.15/alsa-hda-realtek-really-fix-headset-mic-for-tongfang-x6ar55xu.patch b/queue-5.15/alsa-hda-realtek-really-fix-headset-mic-for-tongfang-x6ar55xu.patch
new file mode 100644 (file)
index 0000000..283a073
--- /dev/null
+++ b/queue-5.15/alsa-hda-realtek-really-fix-headset-mic-for-tongfang-x6ar55xu.patch
@@ -0,0 +1,45 @@
+From 1aaedafb21f38cb872d44f7608b4828a1e14e795 Mon Sep 17 00:00:00 2001
+From: Werner Sembach <wse@tuxedocomputers.com>
+Date: Fri, 23 Jan 2026 23:12:24 +0100
+Subject: ALSA: hda/realtek: Really fix headset mic for TongFang X6AR55xU.
+
+From: Werner Sembach <wse@tuxedocomputers.com>
+
+commit 1aaedafb21f38cb872d44f7608b4828a1e14e795 upstream.
+
+Add a PCI quirk to enable microphone detection on the headphone jack of
+TongFang X6AR55xU devices.
+
+The former quirk entry did not acomplish this and is removed.
+
+Fixes: b48fe9af1e60 ("ALSA: hda/realtek: Fix headset mic for TongFang X6AR55xU")
+Signed-off-by: Tim Guttzeit <t.guttzeit@tuxedocomputers.com>
+Signed-off-by: Werner Sembach <wse@tuxedocomputers.com>
+Link: https://patch.msgid.link/20260123221233.28273-1-wse@tuxedocomputers.com
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/pci/hda/patch_realtek.c |    5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -9685,6 +9685,7 @@ static const struct snd_pci_quirk alc269
+       SND_PCI_QUIRK(0x1d05, 0x1147, "TongFang GMxTGxx", ALC269_FIXUP_NO_SHUTUP),
+       SND_PCI_QUIRK(0x1d05, 0x115c, "TongFang GMxTGxx", ALC269_FIXUP_NO_SHUTUP),
+       SND_PCI_QUIRK(0x1d05, 0x121b, "TongFang GMxAGxx", ALC269_FIXUP_NO_SHUTUP),
++      SND_PCI_QUIRK(0x1d05, 0x3031, "TongFang X6AR55xU", ALC2XX_FIXUP_HEADSET_MIC),
+       SND_PCI_QUIRK(0x1d72, 0x1602, "RedmiBook", ALC255_FIXUP_XIAOMI_HEADSET_MIC),
+       SND_PCI_QUIRK(0x1d72, 0x1701, "XiaomiNotebook Pro", ALC298_FIXUP_DELL1_MIC_NO_PRESENCE),
+       SND_PCI_QUIRK(0x1d72, 0x1901, "RedmiBook 14", ALC256_FIXUP_ASUS_HEADSET_MIC),
+@@ -10133,10 +10134,6 @@ static const struct snd_hda_pin_quirk al
+               {0x12, 0x90a60140},
+               {0x19, 0x04a11030},
+               {0x21, 0x04211020}),
+-      SND_HDA_PIN_QUIRK(0x10ec0274, 0x1d05, "TongFang", ALC274_FIXUP_HP_HEADSET_MIC,
+-              {0x17, 0x90170110},
+-              {0x19, 0x03a11030},
+-              {0x21, 0x03211020}),
+       SND_HDA_PIN_QUIRK(0x10ec0282, 0x1025, "Acer", ALC282_FIXUP_ACER_DISABLE_LINEOUT,
+               ALC282_STANDARD_PINS,
+               {0x12, 0x90a609c0},

diff --git a/queue-5.15/nvmet-tcp-pass-iov_len-instead-of-sg-length-to-bvec_set_page.patch b/queue-5.15/nvmet-tcp-pass-iov_len-instead-of-sg-length-to-bvec_set_page.patch
new file mode 100644 (file)
index 0000000..ee33bad
--- /dev/null
+++ b/queue-5.15/nvmet-tcp-pass-iov_len-instead-of-sg-length-to-bvec_set_page.patch
@@ -0,0 +1,34 @@
+From 1f0bbf28940cf5edad90ab57b62aa8197bf5e836 Mon Sep 17 00:00:00 2001
+From: Varun Prakash <varun@chelsio.com>
+Date: Wed, 9 Aug 2023 15:56:45 +0530
+Subject: nvmet-tcp: pass iov_len instead of sg->length to bvec_set_page()
+
+From: Varun Prakash <varun@chelsio.com>
+
+commit 1f0bbf28940cf5edad90ab57b62aa8197bf5e836 upstream.
+
+iov_len is the valid data length, so pass iov_len instead of sg->length to
+bvec_set_page().
+
+Fixes: 5bfaba275ae6 ("nvmet-tcp: don't map pages which can't come from HIGHMEM")
+Signed-off-by: Rakshana Sridhar <rakshanas@chelsio.com>
+Signed-off-by: Varun Prakash <varun@chelsio.com>
+Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
+Reviewed-by: Christoph Hellwig <hch@lst.de>
+Signed-off-by: Keith Busch <kbusch@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/nvme/target/tcp.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/nvme/target/tcp.c
++++ b/drivers/nvme/target/tcp.c
+@@ -341,7 +341,7 @@ static void nvmet_tcp_build_pdu_iovec(st
+               }
+ 
+               iov->bv_page = sg_page(sg);
+-              iov->bv_len = sg->length;
++              iov->bv_len = iov_len;
+               iov->bv_offset = sg->offset + sg_offset;
+ 
+               length -= iov_len;

diff --git a/queue-5.15/series b/queue-5.15/series
index f829fd8c914c3d9ee9e6e762c8dda10c03ee9e7b..b404d5c4dd47d5633cc2f76a728f269a16b68012 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -73,3 +73,5 @@ spi-tegra210-quad-protect-curr_xfer-assignment-in-te.patch
 spi-tegra210-quad-protect-curr_xfer-in-tegra_qspi_co.patch
 spi-tegra210-quad-protect-curr_xfer-clearing-in-tegr.patch
 spi-tegra-fix-a-memory-leak-in-tegra_slink_probe.patch
+nvmet-tcp-pass-iov_len-instead-of-sg-length-to-bvec_set_page.patch
+alsa-hda-realtek-really-fix-headset-mic-for-tongfang-x6ar55xu.patch