From: Sasha Levin Date: Thu, 21 Dec 2023 14:52:45 +0000 (-0500) Subject: Fixes for 5.4 X-Git-Tag: v5.15.145~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e4e61baa0589a5e3ac74cdfa57ce1a42f274ae4;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 5.4 Signed-off-by: Sasha Levin --- diff --git a/queue-5.4/alsa-hda-realtek-enable-headset-on-lenovo-m90-gen5.patch b/queue-5.4/alsa-hda-realtek-enable-headset-on-lenovo-m90-gen5.patch new file mode 100644 index 00000000000..769979934ff --- /dev/null +++ b/queue-5.4/alsa-hda-realtek-enable-headset-on-lenovo-m90-gen5.patch @@ -0,0 +1,36 @@ +From 198bb8e8bef99c13b1349c12502f227aa489f3a3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 4 Dec 2023 18:04:50 +0800 +Subject: ALSA: hda/realtek: Enable headset on Lenovo M90 Gen5 + +From: Bin Li + +[ Upstream commit 6f7e4664e597440dfbdb8b2931c561b717030d07 ] + +Lenovo M90 Gen5 is equipped with ALC897, and it needs +ALC897_FIXUP_HEADSET_MIC_PIN quirk to make its headset mic work. + +Signed-off-by: Bin Li +Cc: +Link: https://lore.kernel.org/r/20231204100450.642783-1-bin.li@canonical.com +Signed-off-by: Takashi Iwai +Signed-off-by: Sasha Levin +--- + sound/pci/hda/patch_realtek.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c +index 5ca5fe75f73fa..bfa66b8e3040b 100644 +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -10395,6 +10395,7 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = { + SND_PCI_QUIRK(0x17aa, 0x32f7, "Lenovo ThinkCentre M90", ALC897_FIXUP_HEADSET_MIC_PIN), + SND_PCI_QUIRK(0x17aa, 0x3321, "Lenovo ThinkCentre M70 Gen4", ALC897_FIXUP_HEADSET_MIC_PIN), + SND_PCI_QUIRK(0x17aa, 0x331b, "Lenovo ThinkCentre M90 Gen4", ALC897_FIXUP_HEADSET_MIC_PIN), ++ SND_PCI_QUIRK(0x17aa, 0x3364, "Lenovo ThinkCentre M90 Gen5", ALC897_FIXUP_HEADSET_MIC_PIN), + SND_PCI_QUIRK(0x17aa, 0x3742, "Lenovo TianYi510Pro-14IOB", ALC897_FIXUP_HEADSET_MIC_PIN2), + SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo Ideapad Y550P", ALC662_FIXUP_IDEAPAD), + SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Ideapad Y550", ALC662_FIXUP_IDEAPAD), +-- +2.43.0 + diff --git a/queue-5.4/ksmbd-fix-wrong-name-of-smb2_create_allocation_size.patch b/queue-5.4/ksmbd-fix-wrong-name-of-smb2_create_allocation_size.patch new file mode 100644 index 00000000000..8b89e256385 --- /dev/null +++ b/queue-5.4/ksmbd-fix-wrong-name-of-smb2_create_allocation_size.patch @@ -0,0 +1,40 @@ +From ce0716970c634e207add8112861ad32ab40f33fd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 6 Dec 2023 08:23:49 +0900 +Subject: ksmbd: fix wrong name of SMB2_CREATE_ALLOCATION_SIZE + +From: Namjae Jeon + +[ Upstream commit 13736654481198e519059d4a2e2e3b20fa9fdb3e ] + +MS confirm that "AISi" name of SMB2_CREATE_ALLOCATION_SIZE in MS-SMB2 +specification is a typo. cifs/ksmbd have been using this wrong name from +MS-SMB2. It should be "AlSi". Also It will cause problem when running +smb2.create.open test in smbtorture against ksmbd. + +Cc: stable@vger.kernel.org +Fixes: 12197a7fdda9 ("Clarify SMB2/SMB3 create context and add missing ones") +Signed-off-by: Namjae Jeon +Reviewed-by: Paulo Alcantara (SUSE) +Signed-off-by: Steve French +Signed-off-by: Sasha Levin +--- + fs/cifs/smb2pdu.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/cifs/smb2pdu.h b/fs/cifs/smb2pdu.h +index 739556e385be8..297f5e455a348 100644 +--- a/fs/cifs/smb2pdu.h ++++ b/fs/cifs/smb2pdu.h +@@ -651,7 +651,7 @@ struct smb2_tree_disconnect_rsp { + #define SMB2_CREATE_SD_BUFFER "SecD" /* security descriptor */ + #define SMB2_CREATE_DURABLE_HANDLE_REQUEST "DHnQ" + #define SMB2_CREATE_DURABLE_HANDLE_RECONNECT "DHnC" +-#define SMB2_CREATE_ALLOCATION_SIZE "AISi" ++#define SMB2_CREATE_ALLOCATION_SIZE "AlSi" + #define SMB2_CREATE_QUERY_MAXIMAL_ACCESS_REQUEST "MxAc" + #define SMB2_CREATE_TIMEWARP_REQUEST "TWrp" + #define SMB2_CREATE_QUERY_ON_DISK_ID "QFid" +-- +2.43.0 + diff --git a/queue-5.4/series b/queue-5.4/series new file mode 100644 index 00000000000..ecbb43b57f7 --- /dev/null +++ b/queue-5.4/series @@ -0,0 +1,2 @@ +alsa-hda-realtek-enable-headset-on-lenovo-m90-gen5.patch +ksmbd-fix-wrong-name-of-smb2_create_allocation_size.patch