linux-kernel - Re: linux-next: manual merge of the mips tree with Linus' 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <CAK8P3a1cGR5y=EFuAOEXyZExXnVi=JcHvVJ0iw=MyY0rvrAmXg@mail.gmail.com>
Date:   Wed, 7 Aug 2019 09:42:20 +0200
From:   Arnd Bergmann <arnd@...db.de>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Ralf Baechle <ralf@...ux-mips.org>,
        James Hogan <jhogan@...nel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Paul Burton <paul.burton@...s.com>
Subject: Re: linux-next: manual merge of the mips tree with Linus' tree

On Wed, Aug 7, 2019 at 2:25 AM Stephen Rothwell <sfr@...b.auug.org.au> 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