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

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

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: [Xen-devel] linux-next: manual merge of the akpm-current tree with the xen-tip tree

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: [Xen-devel] linux-next: manual merge of the akpm-current tree with the xen-tip tree

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: > >

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

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