Merge tag 'for-linus-4.2-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull xen updates from David Vrabel:
 "Xen features and cleanups for 4.2-rc0:

   - add "make xenconfig" to assist in generating configs for Xen guests

   - preparatory cleanups necessary for supporting 64 KiB pages in ARM
     guests

   - automatically use hvc0 as the default console in ARM guests"

* tag 'for-linus-4.2-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  block/xen-blkback: s/nr_pages/nr_segs/
  block/xen-blkfront: Remove invalid comment
  block/xen-blkfront: Remove unused macro MAXIMUM_OUTSTANDING_BLOCK_REQS
  arm/xen: Drop duplicate define mfn_to_virt
  xen/grant-table: Remove unused macro SPP
  xen/xenbus: client: Fix call of virt_to_mfn in xenbus_grant_ring
  xen: Include xen/page.h rather than asm/xen/page.h
  kconfig: add xenconfig defconfig helper
  kconfig: clarify kvmconfig is for kvm
  xen/pcifront: Remove usage of struct timeval
  xen/tmem: use BUILD_BUG_ON() in favor of BUG_ON()
  hvc_xen: avoid uninitialized variable warning
  xenbus: avoid uninitialized variable warning
  xen/arm: allow console=hvc0 to be omitted for guests
  arm,arm64/xen: move Xen initialization earlier
  arm/xen: Correctly check if the event channel interrupt is present

diff --cc arch/arm/kernel/setup.c
Simple merge

diff --cc arch/arm64/kernel/setup.c
index ffd3970721bf6497db2f622bcd3ed31fd3007de1,1b36ba9b73acaf340eed6f717523bd4a3ffc2006..f3067d4d4e35711680376372395667efdc45ad07
--- 1/arch/arm64/kernel/setup.c
--- 2/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@@ -398,13 -409,17 +399,14 @@@ void __init setup_arch(char **cmdline_p
        if (acpi_disabled) {
                unflatten_device_tree();
                psci_dt_init();
 -              cpu_read_bootcpu_ops();
 -#ifdef CONFIG_SMP
 -              of_smp_init_cpus();
 -#endif
        } else {
                psci_acpi_init();
 -              acpi_init_cpus();
        }
+       xen_early_init();
  
 +      cpu_read_bootcpu_ops();
  #ifdef CONFIG_SMP
 +      smp_init_cpus();
        smp_build_mpidr_hash();
  #endif
  

diff --cc drivers/block/xen-blkback/blkback.c
Simple merge

diff --cc drivers/block/xen-blkback/common.h
Simple merge

diff --cc drivers/block/xen-blkfront.c
Simple merge

diff --cc drivers/net/xen-netback/netback.c
Simple merge

diff --cc drivers/net/xen-netfront.c
Simple merge

diff --cc drivers/pci/xen-pcifront.c
Simple merge

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