From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sam Ravnborg Subject: Re: linux-next: manual merge of the kbuild tree with the sparc-next tree Date: Wed, 16 May 2012 06:46:46 +0200 Message-ID: <20120516044646.GA340@merkur.ravnborg.org> References: <20120516134430.14f8e43c6f75604410dae815@canb.auug.org.au> <20120515.235747.716576574995746023.davem@davemloft.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <20120515.235747.716576574995746023.davem@davemloft.net> Sender: linux-kernel-owner@vger.kernel.org To: David Miller Cc: sfr@canb.auug.org.au, mmarek@suse.cz, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: linux-next.vger.kernel.org On Tue, May 15, 2012 at 11:57:47PM -0400, David Miller wrote: > From: Stephen Rothwell > Date: Wed, 16 May 2012 13:44:30 +1000 > > > Today's linux-next merge of the kbuild tree got a conflict in > > arch/sparc/boot/Makefile between commit 51f19cfa76d7 ("sparc32: drop > > build time btfixup patching") from the sparc-next tree and commit > > 95698570510b ("kbuild: refactor final link of sparc32") from the kbuild > > tree. > > > > I have no idea, so I used the version from the sparc-next tree. > > > > Sam, can you have a look and work this out, please? > > As Sam states in: > > http://patchwork.ozlabs.org/patch/159094/ > > This patch will conflict badly with a patch in kbuild-next. > > The fix is simple - drop all changes from kbuild-next. > > :-) The above comment is true for both arch/sparc/Makefile and arch/sparc/bot/Makefile. sparc-next will also conflict with net-next. net-next add the following line to arch/sparc/Makefile: +core-y += arch/sparc/net/ The fix is to add this line to the newly introduced arch/sparc/Kbuild file like this: obj-y += net/ Sorry for these conflicts but we have been busy in sparc land this round. Sam