FAILED: patch "[PATCH] ALSA: hda/realtek - Add Dell ALC295 to pin fall back table" failed to apply to 5.4-stable tree

The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

To reproduce the conflict and resubmit, you may use the following commands:

git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y
git checkout FETCH_HEAD
git cherry-pick -x 4b21a669ca21ed8f24ef4530b2918be5730114de
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2023112438-sizably-prudishly-ce00@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^..

Possible dependencies:

4b21a669ca21 ("ALSA: hda/realtek - Add Dell ALC295 to pin fall back table") 9e43342b464f ("ALSA: hda/realtek - Enable headset mic of ASUS GL503VM with ALC295") 14425f1f521f ("ALSA: hda/realtek: Add quirk for Samsung Notebook") 24164f434dc9 ("ALSA: hda/realtek - Add HP new mute led supported for ALC236") 431e76c3edd7 ("ALSA: hda/realtek - Add supported new mute Led for HP") f5a88b0accc2 ("ALSA: hda/realtek: Enable mute LED on an HP system") 8b33a134a9cc ("ALSA: hda/realtek - Enable the headset of ASUS B9450FA with ALC294") 76f7dec08fd6 ("ALSA: hda/realtek - Add Headset Button supported for ThinkPad X1") 54a6a7dc107d ("ALSA: hda/realtek - Add quirk for the bass speaker on Lenovo Yoga X1 7th gen") 48e01504cf53 ("ALSA: hda/realtek - Enable the bass speaker of ASUS UX431FLC") e79c22695abd ("ALSA: hda/realtek - Add Bass Speaker and fixed dac for bass speaker") d2cd795c4ece ("ALSA: hda - fixup for the bass speaker on Lenovo Carbon X1 7th gen") 436e25505f34 ("ALSA: hda/realtek - Enable internal speaker of ASUS UX431FLC") aed8c7f40882 ("ALSA: hda/realtek - Move some alc256 pintbls to fallback table")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 4b21a669ca21ed8f24ef4530b2918be5730114de Mon Sep 17 00:00:00 2001
From: Kailang Yang <[email protected]>
Date: Fri, 10 Nov 2023 15:16:06 +0800
Subject: [PATCH] ALSA: hda/realtek - Add Dell ALC295 to pin fall back table

Add ALC295 to pin fall back table.
Remove 5 pin quirks for Dell ALC295.
ALC295 was only support MIC2 for external MIC function. ALC295 assigned model "ALC269_FIXUP_DELL1_MIC_NO_PRESENCE" for pin fall back table.
It was assigned wrong model. So, let's remove it.

index 669ae3d6e447..d689f0050aae 100644
@@ -10821,22 +10821,6 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
 		{0x12, 0x90a60130},
 		{0x17, 0x90170110},
 		{0x21, 0x03211020}),
-	SND_HDA_PIN_QUIRK(0x10ec0295, 0x1028, "Dell", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE,
-		{0x14, 0x90170110},
-		{0x21, 0x04211020}),
-	SND_HDA_PIN_QUIRK(0x10ec0295, 0x1028, "Dell", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE,
-		{0x14, 0x90170110},
-		{0x21, 0x04211030}),
-	SND_HDA_PIN_QUIRK(0x10ec0295, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,
-		ALC295_STANDARD_PINS,
-		{0x17, 0x21014020},
-		{0x18, 0x21a19030}),
-	SND_HDA_PIN_QUIRK(0x10ec0295, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,
-		ALC295_STANDARD_PINS,
-		{0x17, 0x21014040},
-		{0x18, 0x21a19050}),
-	SND_HDA_PIN_QUIRK(0x10ec0295, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,
-		ALC295_STANDARD_PINS),
 	SND_HDA_PIN_QUIRK(0x10ec0298, 0x1028, "Dell", ALC298_FIXUP_DELL1_MIC_NO_PRESENCE,
 		ALC298_STANDARD_PINS,
 		{0x17, 0x90170110}),

@@ -10880,6 +10864,9 @@ static const struct snd_hda_pin_quirk alc269_fallback_pin_fixup_tbl[] = {
 	SND_HDA_PIN_QUIRK(0x10ec0289, 0x1028, "Dell", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE,
 		{0x19, 0x40000000},
 		{0x1b, 0x40000000}),
+	SND_HDA_PIN_QUIRK(0x10ec0295, 0x1028, "Dell", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE,
+		{0x19, 0x40000000},
+		{0x1b, 0x40000000}),
 	SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
 		{0x19, 0x40000000},
 		{0x1a, 0x40000000}),