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

Pull xen updates from David Vrabel:
 "xen features and fixes for 4.9:

   - switch to new CPU hotplug mechanism

   - support driver_override in pciback

   - require vector callback for HVM guests (the alternate mechanism via
     the platform device has been broken for ages)"

* tag 'for-linus-4.9-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/x86: Update topology map for PV VCPUs
  xen/x86: Initialize per_cpu(xen_vcpu, 0) a little earlier
  xen/pciback: support driver_override
  xen/pciback: avoid multiple entries in slot list
  xen/pciback: simplify pcistub device handling
  xen: Remove event channel notification through Xen PCI platform device
  xen/events: Convert to hotplug state machine
  xen/x86: Convert to hotplug state machine
  x86/xen: add missing \n at end of printk warning message
  xen/grant-table: Use kmalloc_array() in arch_gnttab_valloc()
  xen: Make VPMU init message look less scary
  xen: rename xen_pmu_init() in sys-hypervisor.c
  hotplug: Prevent alloc/free of irq descriptors during cpu up/down (again)
  xen/x86: Move irq allocation from Xen smp_op.cpu_up()

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

diff --cc include/linux/cpuhotplug.h
index a8ffc40,5f60316..9b207a8
--- 1/include/linux/cpuhotplug.h
--- 2/include/linux/cpuhotplug.h
+++ b/include/linux/cpuhotplug.h
@@@ -36,20 -20,11 +36,22 @@@ enum cpuhp_state 
        CPUHP_PROFILE_PREPARE,
        CPUHP_X2APIC_PREPARE,
        CPUHP_SMPCFD_PREPARE,
 +      CPUHP_RELAY_PREPARE,
 +      CPUHP_SLAB_PREPARE,
 +      CPUHP_MD_RAID5_PREPARE,
        CPUHP_RCUTREE_PREP,
 +      CPUHP_CPUIDLE_COUPLED_PREPARE,
 +      CPUHP_POWERPC_PMAC_PREPARE,
 +      CPUHP_POWERPC_MMU_CTX_PREPARE,
+       CPUHP_XEN_PREPARE,
+       CPUHP_XEN_EVTCHN_PREPARE,
        CPUHP_NOTIFY_PREPARE,
 +      CPUHP_ARM_SHMOBILE_SCU_PREPARE,
 +      CPUHP_SH_SH3X_PREPARE,
 +      CPUHP_BLK_MQ_PREPARE,
        CPUHP_TIMERS_DEAD,
 +      CPUHP_NOTF_ERR_INJ_PREPARE,
 +      CPUHP_MIPS_SOC_PREPARE,
        CPUHP_BRINGUP_CPU,
        CPUHP_AP_IDLE_DEAD,
        CPUHP_AP_OFFLINE,