Merge remote-tracking branch 'xen-tip/linux-next'

Conflicts:
	drivers/xen/Kconfig

diff --cc arch/x86/xen/enlighten.c
Simple merge

diff --cc drivers/xen/Kconfig
index e812c7704c8a8be198398a338d6029a238c8118c,afc39ca5cc4fb11dcf1d185fc8fa50e33d339206..c681adfa778ade3e23e40793ec616a161bfee5bc
--- 1/drivers/xen/Kconfig
--- 2/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@@ -270,8 -253,10 +270,14 @@@ config XEN_EF
        def_bool y
        depends on X86_64 && EFI
  
 +config XEN_ACPI
 +      def_bool y
 +      depends on X86 && ACPI
 +
+ config XEN_AUTO_XLATE
+       def_bool y
+       depends on ARM || ARM64 || XEN_PVHVM
+       help
+         Support for auto-translated physmap guests.
+ 
  endmenu

diff --cc drivers/xen/Makefile
Simple merge

diff --cc drivers/xen/xen-scsiback.c
Simple merge