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