Merge branch 'stable/pci.fixes' into linux-next

* stable/pci.fixes:
  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.

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

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