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

[Michael Ellerman <mpe@ellerman.id.au>]

Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi all,
>
> Today's linux-next merge of the powerpc tree got a conflict in:
>
>   arch/powerpc/Makefile
>
> between commit:
>
>   de51342c5157 ("kbuild: add $(objtree)/ prefix to some in-kernel build artifacts")
>
> from the kbuild tree and commit:
>
>   bee08a9e6ab0 ("powerpc: Adjust adding stack protector flags to KBUILD_CLAGS for clang")
>
> from the powerpc tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Ack.

cheers