Re: linux-next: manual merge of the kbuild tree with the sparc-next tree

From: Stephen Rothwell <redacted>
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.

:-)