* Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> kernel/sysctl.c
>
> between commit:
>
> 20de8f8d3178 ("s390: Move s390 sysctls into their own file under arch/s390")
>
> from the s390 tree and commit:
>
> c305a4e98378 ("x86: Move sysctls into arch/x86")
>
> from the tip 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.
Thank you Stephen!
Ingo
