Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758700Ab3IBSJJ (ORCPT ); Mon, 2 Sep 2013 14:09:09 -0400 Received: from service87.mimecast.com ([91.220.42.44]:43675 "EHLO service87.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755018Ab3IBSJH convert rfc822-to-8bit (ORCPT ); Mon, 2 Sep 2013 14:09:07 -0400 Date: Mon, 2 Sep 2013 19:09:00 +0100 From: Lorenzo Pieralisi To: Olof Johansson Cc: Stephen Rothwell , Sahara , "Rafael J. Wysocki" , Arnd Bergmann , Daniel Lezcano , "linux-kernel@vger.kernel.org" , "Rafael J. Wysocki" , "linux-next@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" Subject: Re: linux-next: manual merge of the arm-soc tree with the pm tree Message-ID: <20130902180900.GC11030@e102568-lin.cambridge.arm.com> References: <20130829180425.4aa3d164f01cc65b215187fe@canb.auug.org.au> <20130829175715.GH18542@quad.lixom.net> MIME-Version: 1.0 In-Reply-To: <20130829175715.GH18542@quad.lixom.net> User-Agent: Mutt/1.5.21 (2010-09-15) X-OriginalArrivalTime: 02 Sep 2013 18:09:01.0155 (UTC) FILETIME=[80540330:01CEA807] X-MC-Unique: 113090219090400201 Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: 8BIT Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2277 Lines: 53 On Thu, Aug 29, 2013 at 06:57:15PM +0100, Olof Johansson wrote: > On Thu, Aug 29, 2013 at 06:04:25PM +1000, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the arm-soc tree got a conflict in > > drivers/cpuidle/Makefile between commits b98e01ad4ed9 ("cpuidle: Add > > Kconfig.arm and move calxeda, kirkwood and zynq") and d3f2950f2ade ("ARM: > > ux500: cpuidle: Move ux500 cpuidle driver to drivers/cpuidle") from the > > pm tree and commit 14d2c34cfa00 ("cpuidle: big.LITTLE: vexpress-TC2 CPU > > idle driver") from the arm-soc tree. > > > > I fixed it up (see below) and can carry the fix as necessary (no action > > is required). > > > > -- > > Cheers, > > Stephen Rothwell sfr@canb.auug.org.au > > > > diff --cc drivers/cpuidle/Makefile > > index 0b9d200,3b6445c..0000000 > > --- a/drivers/cpuidle/Makefile > > +++ b/drivers/cpuidle/Makefile > > @@@ -5,9 -5,7 +5,10 @@@ > > obj-y += cpuidle.o driver.o governor.o sysfs.o governors/ > > obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o > > > > -obj-$(CONFIG_CPU_IDLE_CALXEDA) += cpuidle-calxeda.o > > -obj-$(CONFIG_ARCH_KIRKWOOD) += cpuidle-kirkwood.o > > -obj-$(CONFIG_CPU_IDLE_ZYNQ) += cpuidle-zynq.o > > -obj-$(CONFIG_CPU_IDLE_BIG_LITTLE) += cpuidle-big_little.o > > +################################################################################## > > +# ARM SoC drivers > > +obj-$(CONFIG_ARM_HIGHBANK_CPUIDLE) += cpuidle-calxeda.o > > +obj-$(CONFIG_ARM_KIRKWOOD_CPUIDLE) += cpuidle-kirkwood.o > > +obj-$(CONFIG_ARM_ZYNQ_CPUIDLE) += cpuidle-zynq.o > > +obj-$(CONFIG_ARM_U8500_CPUIDLE) += cpuidle-ux500.o > > ++obj-$(CONFIG_CPU_IDLE_BIG_LITTLE) += cpuidle-big_little.o > > > Might want to sort u8500 before zynq, but otherwise looks fine. I noticed that owing to the merge, CONFIG_CPU_IDLE_BIG_LITTLE should be moved to the newly introduced Kconfig.arm. How are we going to handle this ? It is just a matter of renaming the config entry and moving it to Kconfig.arm. Thanks, Lorenzo -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/