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

[Arnd Bergmann]

On Wed, Aug 7, 2019 at 2:25 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Hi all,
>
> Today's linux-next merge of the mips tree got a conflict in:
>
>   arch/mips/include/asm/vdso/vdso.h
> ( arch/mips/vdso/vdso.h in Linus' tree)
>
> between commit:
>
>   ee38d94a0ad8 ("page flags: prioritize kasan bits over last-cpuid")
>
> from Linus' tree and commit:
>
>   6393e6064486 ("mips: fix vdso32 build, again")
>
> from the mips tree.
>
> I fixed it up (I just used the mips tree version) 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.

Yes, that resolution is correct. My original fix for the issue in ee38d94a0ad8
got folded into that patch when it was merged, but as the vdso is now
completely different in the mips tree, the newer fix is needed there
compared to what is in Linus' tree.

       Arnd