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

[Stephen Rothwell]

Hi Michal,

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?
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature