Merge branch 'for-linus' into for-next

Resolved the conflicts with the latest HDA HDMI fixes.

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

diff --cc sound/pci/hda/patch_hdmi.c
index 490931d020ee585e7bb3ab2db1d223c591fa285d,bcbc4ee10130a5ee86de2c23815eb85ec8684459..fe4141c43ddb76a32e3163fd075dc43ecd8449ae
--- 1/sound/pci/hda/patch_hdmi.c
--- 2/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@@ -2964,7 -2498,18 +2957,19 @@@ static int patch_generic_hdmi(struct hd
  
        init_channel_allocations();
  
+       if (codec_has_acomp(codec)) {
+               codec->depop_delay = 0;
+               spec->i915_audio_ops.audio_ptr = codec;
+               /* intel_audio_codec_enable() or intel_audio_codec_disable()
+                * will call pin_eld_notify with using audio_ptr pointer
+                * We need make sure audio_ptr is really setup
+                */
+               wmb();
+               spec->i915_audio_ops.pin_eld_notify = intel_pin_eld_notify;
+               snd_hdac_i915_register_notifier(&spec->i915_audio_ops);
+       }
+ 
 +      WARN_ON(spec->dyn_pcm_assign && !codec_has_acomp(codec));
        return 0;
  }
  

diff --cc sound/usb/quirks.c
Simple merge