Re: [Xen-devel] linux-next: manual merge of the akpm-current tree with the xen-tip tree

2018-08-17 Thread Boris Ostrovsky
On 08/15/2018 08:05 PM, Stephen Rothwell wrote: > Hi all, > > On Mon, 30 Jul 2018 19:02:10 +1000 Stephen Rothwell > wrote: >> Today's linux-next merge of the akpm-current tree got a conflict in: >> >> drivers/xen/gntdev.c >> >> between commit: >> >> 1d3145675538 ("xen/gntdev: Make private

Re: [Xen-devel] linux-next: manual merge of the akpm-current tree with the xen-tip tree

2018-08-17 Thread Boris Ostrovsky
On 08/15/2018 08:05 PM, Stephen Rothwell wrote: > Hi all, > > On Mon, 30 Jul 2018 19:02:10 +1000 Stephen Rothwell > wrote: >> Today's linux-next merge of the akpm-current tree got a conflict in: >> >> drivers/xen/gntdev.c >> >> between commit: >> >> 1d3145675538 ("xen/gntdev: Make private

Re: linux-next: manual merge of the akpm-current tree with the xen-tip tree

2018-08-15 Thread Stephen Rothwell
Hi all, On Mon, 30 Jul 2018 19:02:10 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: > > drivers/xen/gntdev.c > > between commit: > > 1d3145675538 ("xen/gntdev: Make private routines/structures accessible") > > from the xen-tip tree

Re: linux-next: manual merge of the akpm-current tree with the xen-tip tree

2018-08-15 Thread Stephen Rothwell
Hi all, On Mon, 30 Jul 2018 19:02:10 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: > > drivers/xen/gntdev.c > > between commit: > > 1d3145675538 ("xen/gntdev: Make private routines/structures accessible") > > from the xen-tip tree

Re: linux-next: manual merge of the akpm-current tree with the xen-tip tree

2018-07-30 Thread Boris Ostrovsky
On 07/30/2018 01:02 PM, Boris Ostrovsky wrote: > On 07/30/2018 05:02 AM, Stephen Rothwell wrote: >> Hi all, >> >> Today's linux-next merge of the akpm-current tree got a conflict in: >> >> drivers/xen/gntdev.c >> >> between commit: >> >> 1d3145675538 ("xen/gntdev: Make private

Re: linux-next: manual merge of the akpm-current tree with the xen-tip tree

2018-07-30 Thread Boris Ostrovsky
On 07/30/2018 01:02 PM, Boris Ostrovsky wrote: > On 07/30/2018 05:02 AM, Stephen Rothwell wrote: >> Hi all, >> >> Today's linux-next merge of the akpm-current tree got a conflict in: >> >> drivers/xen/gntdev.c >> >> between commit: >> >> 1d3145675538 ("xen/gntdev: Make private

Re: linux-next: manual merge of the akpm-current tree with the xen-tip tree

2018-07-30 Thread Boris Ostrovsky
On 07/30/2018 05:02 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the akpm-current tree got a conflict in: > > drivers/xen/gntdev.c > > between commit: > > 1d3145675538 ("xen/gntdev: Make private routines/structures accessible") > > from the xen-tip tree and commit: > >

Re: linux-next: manual merge of the akpm-current tree with the xen-tip tree

2018-07-30 Thread Boris Ostrovsky
On 07/30/2018 05:02 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the akpm-current tree got a conflict in: > > drivers/xen/gntdev.c > > between commit: > > 1d3145675538 ("xen/gntdev: Make private routines/structures accessible") > > from the xen-tip tree and commit: > >

linux-next: manual merge of the akpm-current tree with the xen-tip tree

2018-07-30 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: drivers/xen/gntdev.c between commit: 1d3145675538 ("xen/gntdev: Make private routines/structures accessible") from the xen-tip tree and commit: aaefcabe9c25 ("mm, oom: distinguish blockable mode for mmu

linux-next: manual merge of the akpm-current tree with the xen-tip tree

2018-07-30 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: drivers/xen/gntdev.c between commit: 1d3145675538 ("xen/gntdev: Make private routines/structures accessible") from the xen-tip tree and commit: aaefcabe9c25 ("mm, oom: distinguish blockable mode for mmu

linux-next: manual merge of the akpm-current tree with the xen-tip tree

2015-01-28 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in include/linux/mm.h between commit 667a0a06c99d ("mm: provide a find_special_page vma operation") from the xen-tip tree and commit cfd00f5aa195 ("mm: drop vm_ops->remap_pages and generic_file_remap_pages() stub") from

linux-next: manual merge of the akpm-current tree with the xen-tip tree

2015-01-28 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in include/linux/mm.h between commit 667a0a06c99d (mm: provide a find_special_page vma operation) from the xen-tip tree and commit cfd00f5aa195 (mm: drop vm_ops-remap_pages and generic_file_remap_pages() stub) from the