Merge remote-tracking branch 'asoc/topic/intel' into asoc-next

diff --cc include/uapi/sound/snd_sst_tokens.h
Simple merge

diff --cc sound/soc/intel/boards/kbl_rt5663_max98927.c
Simple merge

diff --cc sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
Simple merge

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

diff --cc sound/soc/intel/skylake/skl-nhlt.c
index 26b0a5caea5ab75707bf8461082e18524e80d816,bde7f40f29f5c61da3c2794d10a5ace90f69a03a..3b1d2b828c1b6425c06614cce20293265c3c35ed
--- 1/sound/soc/intel/skylake/skl-nhlt.c
--- 2/sound/soc/intel/skylake/skl-nhlt.c
+++ b/sound/soc/intel/skylake/skl-nhlt.c
@@@ -19,9 -19,8 +19,10 @@@
   */
  #include <linux/pci.h>
  #include "skl.h"
+ #include "skl-i2s.h"
  
 +#define NHLT_ACPI_HEADER_SIG  "NHLT"
 +
  /* Unique identification for getting NHLT blobs */
  static guid_t osc_guid =
        GUID_INIT(0xA69F886E, 0x6CEB, 0x4594,

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

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

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