• Linus Torvalds's avatar
    Merge branches 'stable/drivers-3.2', 'stable/drivers.bugfixes-3.2' and... · 04a87524
    Linus Torvalds authored
    Merge branches 'stable/drivers-3.2', 'stable/drivers.bugfixes-3.2' and 'stable/pci.fixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
    
    * 'stable/drivers-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
      xenbus: don't rely on xen_initial_domain to detect local xenstore
      xenbus: Fix loopback event channel assuming domain 0
      xen/pv-on-hvm:kexec: Fix implicit declaration of function 'xen_hvm_domain'
      xen/pv-on-hvm kexec: add xs_reset_watches to shutdown watches from old kernel
      xen/pv-on-hvm kexec: update xs_wire.h:xsd_sockmsg_type from xen-unstable
      xen/pv-on-hvm kexec+kdump: reset PV devices in kexec or crash kernel
      xen/pv-on-hvm kexec: rebind virqs to existing eventchannel ports
      xen/pv-on-hvm kexec: prevent crash in xenwatch_thread() when stale watch events arrive
    
    * 'stable/drivers.bugfixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
      xen/pciback: Check if the device is found instead of blindly assuming so.
      xen/pciback: Do not dereference psdev during printk when it is NULL.
      xen: remove XEN_PLATFORM_PCI config option
      xen: XEN_PVHVM depends on PCI
      xen/pciback: double lock typo
      xen/pciback: use mutex rather than spinlock in vpci backend
      xen/pciback: Use mutexes when working with Xenbus state transitions.
      xen/pciback: miscellaneous adjustments
      xen/pciback: use mutex rather than spinlock in passthrough backend
      xen/pciback: use resource_size()
    
    * 'stable/pci.fixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
      xen/pci: support multi-segment systems
      xen-swiotlb: When doing coherent alloc/dealloc check before swizzling the MFNs.
      xen/pci: make bus notifier handler return sane values
      xen-swiotlb: fix printk and panic args
      xen-swiotlb: Fix wrong panic.
      xen-swiotlb: Retry up three times to allocate Xen-SWIOTLB
      xen-pcifront: Update warning comment to use 'e820_host' option.
    04a87524
xenbus_probe.c 17.9 KB