Merge branch 'pci/host-vmd' into next

* pci/host-vmd:
  x86/PCI: VMD: Move VMD driver to drivers/pci/host
  x86/PCI: VMD: Synchronize with RCU freeing MSI IRQ descs
  x86/PCI: VMD: Eliminate index member from IRQ list
  x86/PCI: VMD: Eliminate vmd_vector member from list type
  x86/PCI: VMD: Convert to use pci_alloc_irq_vectors() API
  x86/PCI: VMD: Allocate IRQ lists with correct MSI-X count
  PCI: Use positive flags in pci_alloc_irq_vectors()
  PCI: Update "pci=resource_alignment" documentation

Conflicts:
	drivers/pci/host/Kconfig
	drivers/pci/host/Makefile

diff --cc drivers/pci/host/Kconfig
index 90f5e89854be7187ccc623a7b39ac662bd822a27,93865eb2c4c85f8e1ef26b633ac1ca0ca75128a0..d7e7c0a827c3526dec77709298fc56a40ee5954e
--- 1/drivers/pci/host/Kconfig
--- 2/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@@ -274,15 -274,20 +274,31 @@@ config PCIE_ARTPEC
          Say Y here to enable PCIe controller support on Axis ARTPEC-6
          SoCs.  This PCIe controller uses the DesignWare core.
  
 +config PCIE_ROCKCHIP
 +      bool "Rockchip PCIe controller"
 +      depends on ARCH_ROCKCHIP
 +      depends on OF
 +      depends on PCI_MSI_IRQ_DOMAIN
 +      select MFD_SYSCON
 +      help
 +        Say Y here if you want internal PCI support on Rockchip SoC.
 +        There is 1 internal PCIe port available to support GEN2 with
 +        4 slots.
 +
+ config VMD
+       depends on PCI_MSI && X86_64
+       tristate "Intel Volume Management Device Driver"
+       default N
+       ---help---
+         Adds support for the Intel Volume Management Device (VMD). VMD is a
+         secondary PCI host bridge that allows PCI Express root ports,
+         and devices attached to them, to be removed from the default
+         PCI domain and placed within the VMD domain. This provides
+         more bus resources than are otherwise possible with a
+         single domain. If you know your system provides one of these and
+         has devices attached to it, say Y; if you are not sure, say N.
+ 
+         To compile this driver as a module, choose M here: the
+         module will be called vmd.
+ 
  endmenu

diff --cc drivers/pci/host/Makefile
index a8afc16b0299aab1874ed07b317d30adfd16b0af,afea1c61e45a7621b572a2414572f02bc029b508..084cb4983645a298e5d7d3874389b00ff5a7c5f5
--- 1/drivers/pci/host/Makefile
--- 2/drivers/pci/host/Makefile
+++ b/drivers/pci/host/Makefile
@@@ -31,4 -31,4 +31,5 @@@ obj-$(CONFIG_PCI_HOST_THUNDER_ECAM) += 
  obj-$(CONFIG_PCI_HOST_THUNDER_PEM) += pci-thunder-pem.o
  obj-$(CONFIG_PCIE_ARMADA_8K) += pcie-armada8k.o
  obj-$(CONFIG_PCIE_ARTPEC6) += pcie-artpec6.o
 +obj-$(CONFIG_PCIE_ROCKCHIP) += pcie-rockchip.o
+ obj-$(CONFIG_VMD) += vmd.o

diff --cc drivers/pci/host/vmd.c
Simple merge

diff --cc include/linux/pci.h
Simple merge