Subject: Re: linux-next: manual merge of the akpm-current tree with the rsic-v tree

From: Andrew Morton <[email-masked]>
Date: Fri, 29 May 2020 14:18:43 -0700

On Thu, 28 May 2020 12:19:35 -0700 (PDT) Palmer Dabbelt <[email-masked]> 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.