Re: linux-next: manual merge of the livepatching tree with Linus' tree

[Michael Ellerman]

On Mon, 2016-04-18 at 14:23 +1000, Stephen Rothwell wrote:

> Hi Jiri,
> 
> Today's linux-next merge of the livepatching tree got a conflict in:
> 
>   arch/powerpc/Kconfig
> 
> between commit:
> 
>   7f2bd0063342 ("powerpc/mm: enable page parallel initialisation")
> 
> from Linus' tree and commit:
> 
>   85baa095497f ("powerpc/livepatch: Add live patching support on ppc64le")
> 
> from the livepatching 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.
> 
> Maybe the selects under config PPC should be sorted ...

Hmm maybe. I guess it reduces the likelyhood of two new additions clashing
slightly.

cheers