Hi all,
Tomorrow's linux-next merge of the akpm-current tree will get a
conflict in:
Documentation/admin-guide/kernel-parameters.txt
between commit:
f6e5aedf470b ("riscv: Add support for memtest")
from the risc-v tree and commit:
6b8f5ba8661b ("mm,memory_hotplug: add kernel boot option
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
>
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
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
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
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
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:
>
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
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
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 commits:
8250e121c672 ("lib/list_kunit: follow new file name convention for KUnit
tests"
Hi all,
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:
46b9b00649f6 ("arch, mm: restore dependency of __kernel_map_pages() on
DEBUG_PAGEALLOC")
from
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:
> > >
> > >
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
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
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 commits:
3520eeb79142 ("arch, drivers: replace for_each_membock() wit
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
lib/Makefile
between commit:
1a479f783857 ("lib: Add a generic version of devmem_is_allowed()")
from the risc-v tree and commit:
d0bb028dd7f4 ("lib/test_bits.c: add tests of GENMASK")
from the akpm-current tre
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/riscv/Kconfig
between commits:
d3c263cda1a5 ("riscv: Add KGDB support")
ce66581cb6e9 ("riscv: Use the XML target descriptions to report 3 system
registers")
from the risc-v tree and commit:
bbb6dc9ac443
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/riscv/Kconfig
between commit:
d95f1a542c3d ("RISC-V: Implement sparsemem")
from the risc-v tree and commit:
f6a9089b8915 ("riscv: make mmap allocation top-down by default")
from the akpm-current tree.
I
18 matches
Mail list logo
