linux-kernel - Re: linux-next: manual merge of the risc-v tree with the arm-soc 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAK8P3a0QSicc8kQbdCnBUxcCfYDxe6rTLuijstOqpiTkwf3cSw@mail.gmail.com>
Date:   Mon, 25 Jan 2021 10:44:23 +0100
From:   Arnd Bergmann <arnd@...nel.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Palmer Dabbelt <palmer@...belt.com>,
        Paul Walmsley <paul@...an.com>,
        Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
        ARM <linux-arm-kernel@...ts.infradead.org>,
        Damien Le Moal <damien.lemoal@....com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Palmer Dabbelt <palmerdabbelt@...gle.com>
Subject: Re: linux-next: manual merge of the risc-v tree with the arm-soc tree

On Sun, Jan 24, 2021 at 11:14 PM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> 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.

Looks good, thanks!

      Arnd