Merge branch 'for-linus' into for-next

 Conflicts:
	drivers/gpu/drm/i915/intel_display.c
	sound/soc/intel/skylake/skl.h

diff --cc drivers/gpu/drm/i915/i915_drv.h
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem_gtt.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem_stolen.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_display.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_drv.h
Simple merge

diff --cc drivers/gpu/drm/i915/intel_hdmi.c
Simple merge

diff --cc include/sound/soc.h
Simple merge

diff --cc sound/soc/codecs/arizona.c
Simple merge

diff --cc sound/soc/codecs/rt5645.c
Simple merge

diff --cc sound/soc/intel/skylake/skl-topology.c
Simple merge

diff --cc sound/soc/intel/skylake/skl.c
index c38bf99ced103726fcc21d143c5f6a6321e10f2b,caa69c4598a6f14eb27c91575b49aae9fd7d3e8a..b69649aa7809ddba7e48e093b6ab993a8ba84acf
--- 1/sound/soc/intel/skylake/skl.c
--- 2/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@@ -25,8 -25,8 +25,9 @@@
  #include <linux/pci.h>
  #include <linux/pm_runtime.h>
  #include <linux/platform_device.h>
+ #include <linux/firmware.h>
  #include <sound/pcm.h>
 +#include "../common/sst-acpi.h"
  #include "skl.h"
  
  /*

diff --cc sound/soc/intel/skylake/skl.h
index 3d167eed0f59480d1dc81bab6ddecdacee590a92,a0709e344d4419f4a37d28636cc3c79f368acd36..deec048f00c71f2e30920c45d39458e4addd73e3
--- 1/sound/soc/intel/skylake/skl.h
--- 2/sound/soc/intel/skylake/skl.h
+++ b/sound/soc/intel/skylake/skl.h
@@@ -68,10 -67,9 +68,11 @@@ struct skl 
  
        struct skl_dsp_resource resource;
        struct list_head ppl_list;
 -      struct list_head dapm_path_list;
  
 +      const char *fw_name;
+       const struct firmware *tplg;
 +
 +      int supend_active;
  };
  
  #define skl_to_ebus(s)        (&(s)->ebus)