lkml.org 
[lkml]   [2020]   [May]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: 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@dabbelt.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.

\
 
 \ /
  Last update: 2020-05-29 23:19    [W:0.192 / U:0.008 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site