Skip to content
  • Linus Torvalds's avatar
    Merge tag 'stable/for-linus-3.10-rc0-tag-two' of... · 607eeb0b
    Linus Torvalds authored
    Merge tag 'stable/for-linus-3.10-rc0-tag-two' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
    
    Pull Xen bug-fixes from Konrad Rzeszutek Wilk:
     - More fixes in the vCPU PVHVM hotplug path.
     - Add more documentation.
     - Fix various ARM related issues in the Xen generic drivers.
     - Updates in the xen-pciback driver per Bjorn's updates.
     - Mask the x2APIC feature for PV guests.
    
    * tag 'stable/for-linus-3.10-rc0-tag-two' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
      xen/pci: Used cached MSI-X capability offset
      xen/pci: Use PCI_MSIX_TABLE_BIR, not PCI_MSIX_FLAGS_BIRMASK
      xen: clear IRQ_NOAUTOEN and IRQ_NOREQUEST
      xen: mask x2APIC feature in PV
      xen: SWIOTLB is only used on x86
      xen/spinlock: Fix check from greater than to be also be greater or equal to.
      xen/smp/pvhvm: Don't point per_cpu(xen_vpcu, 33 and larger) to shared_info
      xen/vcpu: Document the xen_vcpu_info and xen_vcpu
      xen/vcpu/pvhvm: Fix vcpu hotplugging hanging.
    607eeb0b