Merge branch 'for-linus' into for-next

Conflicts:
	sound/pci/hda/patch_realtek.c

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

diff --cc sound/pci/hda/patch_realtek.c
index 9d3e0fc,919051d..961300d
--- 1/sound/pci/hda/patch_realtek.c
--- 2/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@@ -4521,7 -4515,8 +4521,9 @@@ enum 
        ALC288_FIXUP_DELL_HEADSET_MODE,
        ALC288_FIXUP_DELL1_MIC_NO_PRESENCE,
        ALC288_FIXUP_DELL_XPS_13_GPIO6,
+       ALC292_FIXUP_DELL_E7X,
+       ALC292_FIXUP_DISABLE_AAMIX,
 +      ALC298_FIXUP_DELL1_MIC_NO_PRESENCE,
  };
  
  static const struct hda_fixup alc269_fixups[] = {
@@@ -5044,16 -5039,16 +5046,26 @@@
                .chained = true,
                .chain_id = ALC288_FIXUP_DELL1_MIC_NO_PRESENCE
        },
+       [ALC292_FIXUP_DISABLE_AAMIX] = {
+               .type = HDA_FIXUP_FUNC,
+               .v.func = alc_fixup_disable_aamix,
+       },
+       [ALC292_FIXUP_DELL_E7X] = {
+               .type = HDA_FIXUP_FUNC,
+               .v.func = alc_fixup_dell_xps13,
+               .chained = true,
+               .chain_id = ALC292_FIXUP_DISABLE_AAMIX
+       },
 +      [ALC298_FIXUP_DELL1_MIC_NO_PRESENCE] = {
 +              .type = HDA_FIXUP_PINS,
 +              .v.pins = (const struct hda_pintbl[]) {
 +                      { 0x18, 0x01a1913c }, /* use as headset mic, without its own jack detect */
 +                      { 0x1a, 0x01a1913d }, /* use as headphone mic, without its own jack detect */
 +                      { }
 +              },
 +              .chained = true,
 +              .chain_id = ALC269_FIXUP_HEADSET_MODE
 +      },
  };
  
  static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@@ -5671,15 -5651,8 +5685,14 @@@ static int patch_alc269(struct hda_code
  
        spec = codec->spec;
        spec->gen.shared_mic_vref_pin = 0x18;
-       if (codec->core.vendor_id != 0x10ec0292)
-               codec->power_save_node = 1;
+       codec->power_save_node = 1;
  
 +#ifdef CONFIG_PM
 +      codec->patch_ops.suspend = alc269_suspend;
 +      codec->patch_ops.resume = alc269_resume;
 +#endif
 +      spec->shutup = alc269_shutup;
 +
        snd_hda_pick_fixup(codec, alc269_fixup_models,
                       alc269_fixup_tbl, alc269_fixups);
        snd_hda_pick_pin_fixup(codec, alc269_pin_fixup_tbl, alc269_fixups);

diff --cc sound/pci/hda/patch_sigmatel.c
Simple merge