Re: linux-next: manual merge of the xen-tip tree with Linus' tree

2018-02-15 Thread Stefano Stabellini
On Fri, 16 Feb 2018, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the xen-tip tree got a conflict in: > > drivers/xen/pvcalls-front.c > > between commit: > > a9a08845e9ac ("vfs: do bulk POLL* -> EPOLL* replacement") > > from Linus' tree and commit: > > 1e7dbff356e5

linux-next: manual merge of the xen-tip tree with Linus' tree

2018-02-15 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the xen-tip tree got a conflict in: drivers/xen/pvcalls-front.c between commit: a9a08845e9ac ("vfs: do bulk POLL* -> EPOLL* replacement") from Linus' tree and commit: 1e7dbff356e5 ("pvcalls-front: introduce a per sock_mapping refcount") from the xen-

linux-next: manual merge of the xen-tip tree with Linus' tree

2015-10-06 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the xen-tip tree got a conflict in: arch/x86/xen/p2m.c between commit: 98dd166ea3a3 ("x86/xen/p2m: hint at the last populated P2M entry") from Linus' tree and commit: c5fdd42b47ab ("x86/xen: export xen_alloc_p2m_entry()") from the xen-tip tree. I fi

linux-next: manual merge of the xen-tip tree with Linus' tree

2015-08-13 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the xen-tip tree got a conflict in: arch/x86/xen/Makefile between commit: fc5fee86bdd3 ("x86/xen: build "Xen PV" APIC driver for domU as well") from Linus' tree and commit: 6e3012fba294 ("xen/PMU: Initialization code for Xen PMU") from the xen-tip tr