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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAK8P3a0EhPNp6HCJuwJGze1GxdbQpcbYsS9J+tqC1yt2Z13W_w@mail.gmail.com>
Date:   Tue, 22 Feb 2022 14:41:08 +0100
From:   Arnd Bergmann <arnd@...db.de>
To:     Mark Brown <broonie@...nel.org>
Cc:     Thomas Bogendoerfer <tsbogend@...ha.franken.de>,
        Arnd Bergmann <arnd@...db.de>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the mips tree with the asm-generic tree

On Tue, Feb 22, 2022 at 12:42 PM <broonie@...nel.org> 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