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

On Thu, 17 Dec 2020 01:40:51 PST (-0800), andy.shevche...@gmail.com wrote: On Thu, Dec 17, 2020 at 3:28 AM Stephen Rothwell wrote: Hi all, On Mon, 14 Dec 2020 20:21:07 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: > > lib/Makefile >

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

Hi Andy, On Thu, 17 Dec 2020 11:40:51 +0200 Andy Shevchenko wrote: > > Yeah, and it's slightly different. Perhaps RISC-V tree can handle this > by moving Makefile entry somewhere else in the file. Or just let Linus take care of it ... -- Cheers, Stephen Rothwell pgprUxnfVtQtO.pgp Descriptio

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

On Thu, Dec 17, 2020 at 3:28 AM Stephen Rothwell wrote: > > Hi all, > > On Mon, 14 Dec 2020 20:21:07 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the akpm-current tree got a conflict in: > > > > lib/Makefile > > > > between commit: > > > > 527701eda5f1 ("lib: Add a gen

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

On 2020/12/17 9:26, Stephen Rothwell wrote: Hi all, On Fri, 27 Nov 2020 18:34:41 +1100 Stephen Rothwell wrote: Today's linux-next merge of the akpm-current tree got a conflict in: arch/riscv/Kconfig between commit: 5cb0080f1bfd ("riscv: Enable ARCH_STACKWALK") from the risc-v tree

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

Hi all, On Fri, 27 Nov 2020 18:34:41 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: > > arch/riscv/Kconfig > > between commit: > > 5cb0080f1bfd ("riscv: Enable ARCH_STACKWALK") > > from the risc-v tree and commit: > > 46b9b00649

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

Hi all, On Mon, 14 Dec 2020 20:21:07 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: > > lib/Makefile > > between commit: > > 527701eda5f1 ("lib: Add a generic version of devmem_is_allowed()") > > from the risc-v tree and commits: >

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

On Mon, 14 Dec 2020 09:37:47 PST (-0800), andriy.shevche...@linux.intel.com wrote: On Mon, Dec 14, 2020 at 08:21:07PM +1100, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: lib/Makefile between commit: 527701eda5f1 ("lib: Add a generi

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

On Mon, Dec 14, 2020 at 08:21:07PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the akpm-current tree got a conflict in: > > lib/Makefile > > between commit: > > 527701eda5f1 ("lib: Add a generic version of devmem_is_allowed()") > > from the risc-v tree and comm

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

On Tue, 2020-10-06 at 21:48 -0700, Atish Patra wrote: > On Tue, 2020-10-06 at 21:32 -0700, Palmer Dabbelt wrote: > > On Tue, 06 Oct 2020 03:39:06 PDT (-0700), Stephen Rothwell wrote: > > > Hi all, > > > > > > Today's linux-next merge of the akpm-current tree got a conflict > > > in: > > > > > >

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

On Tue, 2020-10-06 at 21:32 -0700, Palmer Dabbelt wrote: > On Tue, 06 Oct 2020 03:39:06 PDT (-0700), Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the akpm-current tree got a conflict > > in: > > > > arch/riscv/mm/init.c > > > > between commit: > > > > c29c38fa2a8b

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

On Tue, 06 Oct 2020 03:39:06 PDT (-0700), Stephen Rothwell wrote: Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: arch/riscv/mm/init.c between commit: c29c38fa2a8b ("RISC-V: Remove any memblock representing unusable memory area") from the risc-v tree and comm