linux-next: manual merge of the sound-asoc tree with the sound tree

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mark Brown <broonie@kernel.org>,
	Liam Girdwood <lgirdwood@gmail.com>, Takashi Iwai <tiwai@suse.de>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Krzysztof Kozlowski <krzk@kernel.org>,
	Naveen M <naveen.m@intel.com>
Subject: linux-next: manual merge of the sound-asoc tree with the sound tree
Date: Wed, 16 Oct 2019 11:33:05 +1100	[thread overview]
Message-ID: <20191016113305.626f02e0@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 2318 bytes --]

Hi all,

Today's linux-next merge of the sound-asoc tree got a conflict in:

  sound/soc/intel/boards/Kconfig

between commit:

  82e8d723e9e6 ("sound: Fix Kconfig indentation")

from the sound tree and commit:

  47cbea216281 ("ASoC: Intel: eve: Enable mclk and ssp sclk early")

from the sound-asoc tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc sound/soc/intel/boards/Kconfig
index 882ff36a7c9c,5e0e7dbd1300..000000000000

--- a/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@@ -311,20 -311,21 +311,21 @@@ config SND_SOC_INTEL_KBL_RT5663_MAX9892
  	  If unsure select "N".
  
  config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH
 -        tristate "KBL with RT5663, RT5514 and MAX98927 in I2S Mode"
 +	tristate "KBL with RT5663, RT5514 and MAX98927 in I2S Mode"
  	depends on I2C && ACPI
  	depends on MFD_INTEL_LPSS || COMPILE_TEST
 -        depends on SPI
 -        select SND_SOC_RT5663
 -        select SND_SOC_RT5514
 -        select SND_SOC_RT5514_SPI
 -        select SND_SOC_MAX98927
 -        select SND_SOC_HDAC_HDMI
 +	depends on SPI
 +	select SND_SOC_RT5663
 +	select SND_SOC_RT5514
 +	select SND_SOC_RT5514_SPI
 +	select SND_SOC_MAX98927
 +	select SND_SOC_HDAC_HDMI
+ 	select SND_SOC_INTEL_SKYLAKE_SSP_CLK
 -        help
 -          This adds support for ASoC Onboard Codec I2S machine driver. This will
 -          create an alsa sound card for RT5663 + RT5514 + MAX98927.
 -          Say Y or m if you have such a device. This is a recommended option.
 -          If unsure select "N".
 +	help
 +	  This adds support for ASoC Onboard Codec I2S machine driver. This will
 +	  create an alsa sound card for RT5663 + RT5514 + MAX98927.
 +	  Say Y or m if you have such a device. This is a recommended option.
 +	  If unsure select "N".
  
  config SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH
  	tristate "KBL with DA7219 and MAX98357A in I2S Mode"

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
