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

2020-05-29 Thread Andrew Morton
On Thu, 28 May 2020 12:19:35 -0700 (PDT) Palmer Dabbelt 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

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

2020-05-28 Thread Palmer Dabbelt
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 pa

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

2020-05-28 Thread Stephen Rothwell
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") from the rsic-v tree and commits: e8d3552c4f20 ("mm: remove CONFIG_HAVE_MEMBLOCK_NODE_MAP option") 4d01b8e622