From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753154AbaBXPLA (ORCPT ); Mon, 24 Feb 2014 10:11:00 -0500 Received: from mho-02-ewr.mailhop.org ([204.13.248.72]:39942 "EHLO mho-02-ewr.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752539AbaBXPK6 (ORCPT ); Mon, 24 Feb 2014 10:10:58 -0500 X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 108.39.110.144 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX19xCAvc25Lg8/Oh5NuRa4vuQd3C/A0w9SM= X-DKIM: OpenDKIM Filter v2.0.1 titan D09845321AE Date: Mon, 24 Feb 2014 10:10:18 -0500 From: Jason Cooper To: Stephen Rothwell Cc: Mark Brown , Liam Girdwood , andrew@lunn.ch, gregory.clement@free-electrons.com, linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Thomas Petazzoni Subject: Re: linux-next: manual merge of the sound-asoc tree with the mvebu tree Message-ID: <20140224151018.GE14250@titan.lakedaemon.net> References: <20140224133752.bc1ffffa4e81edb76a76e555@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20140224133752.bc1ffffa4e81edb76a76e555@canb.auug.org.au> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Stephen, On Mon, Feb 24, 2014 at 01:37:52PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the sound-asoc tree got a conflict in > sound/soc/kirkwood/Kconfig between commit cd34edc2eab2 ("drivers: Enable > building of Kirkwood drivers for mach-mvebu") from the tree and commit > 9a0d5113ac0e ("ASoC: kirkwood: enable Kirkwood driver for mvebu > platforms") from the sound-asoc tree. > > I fixed it up (Probably incorrectly - see below) and can carry the fix as > necessary (no action is required). Yes, sorry this isn't ideal. We're moving all DT support from mach-kirkwood to mach-mvebu and having to keep legacy support for a cycle. Hence the confusing config symbols. This resolution is correct. thx, Jason. > > -- > Cheers, > Stephen Rothwell sfr@canb.auug.org.au > > diff --cc sound/soc/kirkwood/Kconfig > index 106e2e22fed2,2dc3ecf34801..000000000000 > --- a/sound/soc/kirkwood/Kconfig > +++ b/sound/soc/kirkwood/Kconfig > @@@ -1,6 -1,6 +1,6 @@@ > config SND_KIRKWOOD_SOC > tristate "SoC Audio for the Marvell Kirkwood and Dove chips" > - depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_KIRKWOOD || COMPILE_TEST > - depends on ARCH_KIRKWOOD || ARCH_DOVE || ARCH_MVEBU || COMPILE_TEST > ++ depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_KIRKWOOD || ARCH_MVEBU || COMPILE_TEST > help > Say Y or M if you want to add support for codecs attached to > the Kirkwood I2S interface. You will also need to select the