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

On Thu, 26 Mar 2015, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the xen-tip tree got a conflict in > drivers/xen/Kconfig between commit 94ccae47e02d ("XEN / ACPI: Make XEN > ACPI depend on X86") from the arm64-acpi tree and commit 628c28eefd6f > ("xen: unify foreign GFN map/

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

Hi all, Today's linux-next merge of the xen-tip tree got a conflict in drivers/xen/Kconfig between commit 94ccae47e02d ("XEN / ACPI: Make XEN ACPI depend on X86") from the arm64-acpi tree and commit 628c28eefd6f ("xen: unify foreign GFN map/unmap for auto-xlated physmap guests") from the xen-tip t