Merge branch 'for-linus' into for-next

Conflicts:
	sound/hda/hdac_i915.c

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

diff --cc sound/hda/hdac_i915.c
index d0da250,54babe1..6800e0c
--- 1/sound/hda/hdac_i915.c
--- 2/sound/hda/hdac_i915.c
+++ b/sound/hda/hdac_i915.c
@@@ -306,9 -298,9 +318,12 @@@ int snd_hdac_i915_init(struct hdac_bus 
        struct i915_audio_component *acomp;
        int ret;
  
 +      if (WARN_ON(hdac_acomp))
 +              return -EBUSY;
 +
+       if (!i915_gfx_present())
+               return -ENODEV;
+ 
        acomp = kzalloc(sizeof(*acomp), GFP_KERNEL);
        if (!acomp)
                return -ENOMEM;