Merge branch 'stable/xen-pciback-0.6.3' into stable/drivers

* stable/xen-pciback-0.6.3:
  xen/pciback: Have 'passthrough' option instead of XEN_PCIDEV_BACKEND_PASS and XEN_PCIDEV_BACKEND_VPCI
  xen/pciback: Remove the DEBUG option.
  xen/pciback: Drop two backends, squash and cleanup some code.
  xen/pciback: Print out the MSI/MSI-X (PIRQ) values
  xen/pciback: Don't setup an fake IRQ handler for SR-IOV devices.
  xen: rename pciback module to xen-pciback.
  xen/pciback: Fine-grain the spinlocks and fix BUG: scheduling while atomic cases.
  xen/pciback: Allocate IRQ handler for device that is shared with guest.
  xen/pciback: Disable MSI/MSI-X when reseting a device
  xen/pciback: guest SR-IOV support for PV guest
  xen/pciback: Register the owner (domain) of the PCI device.
  xen/pciback: Cleanup the driver based on checkpatch warnings and errors.
  xen/pciback: xen pci backend driver.

Conflicts:
	drivers/xen/Kconfig

diff --cc drivers/xen/Kconfig
index 5014c6dcbdfaa11659893a977465ee811c44e12b,9b700b4a987a1457b127a224bfdca6e47b17499d..03bc471c3eed4ce40901652466c74d3d1dac7647
--- 1/drivers/xen/Kconfig
--- 2/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@@ -122,11 -105,26 +122,33 @@@ config SWIOTLB_XE
        depends on PCI
        select SWIOTLB
  
 +config XEN_TMEM
 +      bool
 +      default y if (CLEANCACHE || FRONTSWAP)
 +      help
 +        Shim to interface in-kernel Transcendent Memory hooks
 +        (e.g. cleancache and frontswap) to Xen tmem hypercalls.
 +
+ config XEN_PCIDEV_BACKEND
+       tristate "Xen PCI-device backend driver"
+       depends on PCI && X86 && XEN
+       depends on XEN_BACKEND
+       default m
+       help
+         The PCI device backend driver allows the kernel to export arbitrary
+         PCI devices to other guests. If you select this to be a module, you
+         will need to make sure no other driver has bound to the device(s)
+         you want to make visible to other guests.
+ 
+         The parameter "passthrough" allows you specify how you want the PCI
+         devices to appear in the guest. You can choose the default (0) where
+         PCI topology starts at 00.00.0, or (1) for passthrough if you want
+         the PCI devices topology appear the same as in the host.
+ 
+         The "hide" parameter (only applicable if backend driver is compiled
+         into the kernel) allows you to bind the PCI devices to this module
+         from the default device drivers. The argument is the list of PCI BDFs:
+         xen-pciback.hide=(03:00.0)(04:00.0)
+ 
+         If in doubt, say m.
  endmenu

diff --cc drivers/xen/Makefile
index bc3bf5679f6e38fa7281f5461e7e54468b8982e0,35a72ef3afaca8b01ed8837fcbdbc29ce94413c3..72bbb27d7a68dc43a45ba836288aed641b4f8113
--- 1/drivers/xen/Makefile
--- 2/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@@ -15,9 -15,9 +15,10 @@@ obj-$(CONFIG_XEN_GRANT_DEV_ALLOC)    += xe
  obj-$(CONFIG_XENFS)                   += xenfs/
  obj-$(CONFIG_XEN_SYS_HYPERVISOR)      += sys-hypervisor.o
  obj-$(CONFIG_XEN_PLATFORM_PCI)                += xen-platform-pci.o
 +obj-$(CONFIG_XEN_TMEM)                        += tmem.o
  obj-$(CONFIG_SWIOTLB_XEN)             += swiotlb-xen.o
  obj-$(CONFIG_XEN_DOM0)                        += pci.o
+ obj-$(CONFIG_XEN_PCIDEV_BACKEND)      += xen-pciback/
  
  xen-evtchn-y                          := evtchn.o
  xen-gntdev-y                          := gntdev.o