[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20130409113007.GB14496@n2100.arm.linux.org.uk>
Date: Tue, 9 Apr 2013 12:30:07 +0100
From: Russell King - ARM Linux <linux@....linux.org.uk>
To: Arnd Bergmann <arnd@...db.de>
Cc: Stephen Rothwell <sfr@...b.auug.org.au>,
Olof Johansson <olof@...om.net>, linux-next@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org
Subject: Re: linux-next: build warning after merge of the final tree
(probably arm-soc tree related)
On Tue, Apr 09, 2013 at 11:21:24AM +0200, Arnd Bergmann wrote:
> On Tuesday 09 April 2013, Stephen Rothwell wrote:
> > After merging the final tree, today's linux-next build (arm defconfig)
> > produced these warnings:
> >
> > arch/arm/mach-cns3xxx/Kconfig:2:warning: choice value used outside its choice group
> > arch/arm/mach-bcm2835/Kconfig:2:warning: choice value used outside its choice group
> > arch/arm/Kconfig:287:error: recursive dependency detected!
> > arch/arm/Kconfig:287: choice <choice> contains symbol ARCH_CNS3XXX
> > arch/arm/Kconfig:366: symbol ARCH_CNS3XXX depends on ARCH_MULTI_V6
> > arch/arm/Kconfig:933: symbol ARCH_MULTI_V6 depends on ARCH_MULTIPLATFORM
> > arch/arm/Kconfig:292: symbol ARCH_MULTIPLATFORM is part of choice <choice>
>
> Thanks for the notification, I think git rerere picked up a wrong conflict resolution
> again that I did earlier. I'll fix it when I do the next pulls today.
The problem commit is: d4b63675f7202d2d7865aa19d83537e615ad3c50 which is
your next/multiplatform branch. It re-introduces the ARCH_CNS3XXX
in arch/arm/Kconfig, which should've remained deleted.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists