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

Pull xen updates from Juergen Gross:
 "Other than fixes and cleanups it contains:

   - support > 32 VCPUs at domain restore

   - support for new sysfs nodes related to Xen

   - some performance tuning for Linux running as Xen guest"

* tag 'for-linus-4.13-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  x86/xen: allow userspace access during hypercalls
  x86: xen: remove unnecessary variable in xen_foreach_remap_area()
  xen: allocate page for shared info page from low memory
  xen: avoid deadlock in xenbus driver
  xen: add sysfs node for hypervisor build id
  xen: sync include/xen/interface/version.h
  xen: add sysfs node for guest type
  doc,xen: document hypervisor sysfs nodes for xen
  xen/vcpu: Handle xen_vcpu_setup() failure at boot
  xen/vcpu: Handle xen_vcpu_setup() failure in hotplug
  xen/pv: Fix OOPS on restore for a PV, !SMP domain
  xen/pvh*: Support > 32 VCPUs at domain restore
  xen/vcpu: Simplify xen_vcpu related code
  xen-evtchn: Bind dyn evtchn:qemu-dm interrupt to next online VCPU
  xen: avoid type warning in xchg_xen_ulong
  xen: fix HYPERVISOR_dm_op() prototype
  xen: don't print error message in case of missing Xenstore entry
  arm/xen: Adjust one function call together with a variable assignment
  arm/xen: Delete an error message for a failed memory allocation in __set_phys_to_machine_multi()
  arm/xen: Improve a size determination in __set_phys_to_machine_multi()

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/xen/events/events_base.c
index 2e567d8433b3d4999dba3e67827d8599d4b6dad4,813f1e86a59914fb56d602d2eed1cc45e3ceb478..b241bfa529ce3cd9879da106b04531fc03b005e9
--- 1/drivers/xen/events/events_base.c
--- 2/drivers/xen/events/events_base.c
+++ b/drivers/xen/events/events_base.c
@@@ -1343,12 -1343,8 +1343,12 @@@ static int set_affinity_irq(struct irq_
                            bool force)
  {
        unsigned tcpu = cpumask_first_and(dest, cpu_online_mask);
-       int ret = rebind_irq_to_cpu(data->irq, tcpu);
++      int ret = xen_rebind_evtchn_to_cpu(evtchn_from_irq(data->irq), tcpu);
  
 -      return xen_rebind_evtchn_to_cpu(evtchn_from_irq(data->irq), tcpu);
 +      if (!ret)
 +              irq_data_update_effective_affinity(data, cpumask_of(tcpu));
 +
 +      return ret;
  }
  
  static void enable_dynirq(struct irq_data *data)

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