linux-next: manual merge of the akpm-current tree with the parisc-hd tree

2019-05-08 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: arch/parisc/mm/init.c between commit: 98429dded340 ("parisc: Enable SPARSEMEM_VMEMMAP") from the parisc-hd tree and commit: 2e5adbd9e97a ("initramfs: provide a generic free_initrd_mem implementation") from the

linux-next: manual merge of the akpm-current tree with the parisc-hd tree

2019-05-02 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: arch/parisc/mm/init.c between commit: 1fb55c4cf4e6 ("parisc: Enable SPARSEMEM_VMEMMAP") from the parisc-hd tree and commit: 2e5adbd9e97a ("initramfs: provide a generic free_initrd_mem implementation") from the

Re: linux-next: manual merge of the akpm-current tree with the parisc-hd tree

2017-09-04 Thread Stephen Rothwell
Hi Helge, On Tue, 5 Sep 2017 08:09:01 +0200 Helge Deller wrote: > > >> diff --cc arch/parisc/include/uapi/asm/mman.h > >> index 9a9c2fe4be50,f6eec376e5fa.. > >> --- a/arch/parisc/include/uapi/asm/mman.h > >> +++ b/arch/parisc/include/uapi/asm/mman.h > >> @@@ -57,9 -60,9 +57,12 @@@ > >

Re: linux-next: manual merge of the akpm-current tree with the parisc-hd tree

2017-09-04 Thread Helge Deller
On 05.09.2017 02:34, Stephen Rothwell wrote: > Hi all, > > On Tue, 22 Aug 2017 16:53:18 +1000 Stephen Rothwell > wrote: >> >> Today's linux-next merge of the akpm-current tree got a conflict in: >> >> arch/parisc/include/uapi/asm/mman.h >> >> between commit: >> >> 1c190151447d ("parisc: Add

Re: linux-next: manual merge of the akpm-current tree with the parisc-hd tree

2017-09-04 Thread Stephen Rothwell
Hi all, On Tue, 22 Aug 2017 16:53:18 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: > > arch/parisc/include/uapi/asm/mman.h > > between commit: > > 1c190151447d ("parisc: Add MADV_HWPOISON and MADV_SOFT_OFFLINE") > > from the parisc

linux-next: manual merge of the akpm-current tree with the parisc-hd tree

2017-08-21 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: arch/parisc/include/uapi/asm/mman.h between commit: 1c190151447d ("parisc: Add MADV_HWPOISON and MADV_SOFT_OFFLINE") from the parisc-hd tree and commit: 115d20ededaf ("mm,fork: introduce MADV_WIPEONFORK") f

linux-next: manual merge of the akpm-current tree with the parisc-hd tree

2016-09-20 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: arch/parisc/Kconfig between commit: b5d5cf2b8a68 ("parisc: Drop BROKEN_RODATA config option") from the parisc-hd tree and commit: 7b4d24d8c01d ("atomic64: no need for CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIV

linux-next: manual merge of the akpm-current tree with the parisc-hd tree

2015-03-30 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in arch/parisc/include/asm/Kbuild between commit 476840458128 ("parisc: Eliminate sg_virt_addr() and private scatterlist.h") from the parisc-hd tree and commit e494f4a463cd ("parisc: switch to using asm-generic for seccomp