linux-kernel - Re: linux-next: manual merge of the akpm-current tree with the rsic-v 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: <20200529141843.5bf4c1b34d896af3a8ccf059@linux-foundation.org>
Date:   Fri, 29 May 2020 14:18:43 -0700
From:   Andrew Morton <akpm@...ux-foundation.org>
To:     Palmer Dabbelt <palmer@...belt.com>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Paul Walmsley <paul@...an.com>, linux-next@...r.kernel.org,
        linux-kernel@...r.kernel.org, zong.li@...ive.com,
        rppt@...ux.ibm.com
Subject: Re: linux-next: manual merge of the akpm-current tree with the
 rsic-v tree

On Thu, 28 May 2020 12:19:35 -0700 (PDT) Palmer Dabbelt <palmer@...belt.com> wrote:

> On Thu, 28 May 2020 02:22:11 PDT (-0700), Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the akpm-current tree got a conflict in:
> >
> >   arch/riscv/Kconfig
> >
> > between commit:
> >
> >   b151fefd23b7 ("riscv: sort select statements alphanumerically")
> 
> Andrew: Maybe it's easier if just drop the patch?  It comes from a script, so I
> can just resurrect it when things are less busy.
> 

That's OK - whoever merges second will have some trivial fixing to do,
not a big deal.