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

[Martin Schwidefsky]

On Mon, 4 Sep 2017 09:49:28 +1000
Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:

> Hi all,
> 
> Today's linux-next merge of the s390 tree got a conflict in:
> 
>   arch/s390/include/asm/mmu_context.h
> 
> between commit:
> 
>   0b89ede62963 ("s390/mm: fork vs. 5 level page tabel")
> 
> from Linus' tree and commit:
> 
>   f1c1174fa099 ("s390/mm: use new mm defines instead of magic values")
> 
> from the s390 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.
 
Fixup looks fine, thank you!

-- 
blue skies,
   Martin.

"Reality continues to ruin my life." - Calvin.