From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 3 Sep 2024 16:07:46 +0000 (+0200)
Subject: Merge branch 'for-linus' into for-next
X-Git-Tag: v6.12-rc1~169^2~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2994586e2c484c5a3e799ba8e3f218894b8b0bb7;p=thirdparty%2Fkernel%2Fstable.git

Merge branch 'for-linus' into for-next

Pull 6.11 devel branch.  The conflicts in HD-audio Realtek codec driver
got resolved.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

2994586e2c484c5a3e799ba8e3f218894b8b0bb7
diff --cc sound/pci/hda/patch_realtek.c
index 2d4db5ce86246,fd7711d698233..f67190a8cd93d
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@@ -7606,6 -7637,8 +7607,7 @@@ enum 
  	ALC256_FIXUP_CHROME_BOOK,
  	ALC287_FIXUP_LENOVO_14ARP8_LEGION_IAH7,
  	ALC287_FIXUP_LENOVO_SSID_17AA3820,
 -	ALCXXX_FIXUP_CS35LXX,
+ 	ALC245_FIXUP_CLEVO_NOISY_MIC,
  };
  
  /* A special fixup for Lenovo C940 and Yoga Duet 7;
@@@ -9921,6 -9974,16 +9929,12 @@@ static const struct hda_fixup alc269_fi
  		.type = HDA_FIXUP_FUNC,
  		.v.func = alc287_fixup_lenovo_ssid_17aa3820,
  	},
 -	[ALCXXX_FIXUP_CS35LXX] = {
 -		.type = HDA_FIXUP_FUNC,
 -		.v.func = cs35lxx_autodet_fixup,
 -	},
+ 	[ALC245_FIXUP_CLEVO_NOISY_MIC] = {
+ 		.type = HDA_FIXUP_FUNC,
+ 		.v.func = alc269_fixup_limit_int_mic_boost,
+ 		.chained = true,
+ 		.chain_id = ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE,
+ 	},
  };
  
  static const struct snd_pci_quirk alc269_fixup_tbl[] = {