Re: linux-next: manual merge of the mips tree with the asm-generic tree

[Arnd Bergmann]

On Tue, Feb 22, 2022 at 12:42 PM <broonie@xxxxxxxxxx> wrote:
>
> Hi all,
>
> Today's linux-next merge of the mips tree got a conflict in:
>
>   arch/mips/sibyte/common/sb_tbprof.c
>
> between commit:
>
>   27e8140d7819b ("uaccess: fix type mismatch warnings from access_ok()")
>
> from the asm-generic tree and commit:
>
>   10242464e506b ("MIPS: sibyte: Add missing __user annotations in sb_tbprof.c")
>
> from the mips 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.

Thanks for the report. I needed to rebase my tree anyway, dropped
the duplicate change from my local copy for now, should be part of
my public branch in a few days when I send a new version of the series.

       Arnd