Merge remote-tracking branch 'pci/next'

diff --cc Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/powerpc/platforms/pseries/setup.c
Simple merge

diff --cc arch/x86/pci/common.c
Simple merge

diff --cc drivers/pci/host/Kconfig
index d5e58bae95cf2dbfa74a49ddce1a51dee6e98e9d,2af0571356e8c30992f189f1b7c418d590149fb9..7a31ebbc43793b8631990e1307b2dce3d882da38
--- 1/drivers/pci/host/Kconfig
--- 2/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@@ -145,4 -147,28 +147,29 @@@ config PCIE_IPROC_BCM
          Say Y here if you want to use the Broadcom iProc PCIe controller
          through the BCMA bus interface
  
+ config PCIE_ALTERA
+       bool "Altera PCIe controller"
+       depends on ARM || NIOS2
+       select PCI_DOMAINS
+       help
+         Say Y here if you want to enable PCIe controller support on Altera
+         FPGA.
+ 
+ config PCIE_ALTERA_MSI
+       bool "Altera PCIe MSI feature"
+       depends on PCI_MSI
++      depends on BROKEN
+       select PCI_MSI_IRQ_DOMAIN
+       help
+         Say Y here if you want PCIe MSI support for the Altera FPGA.
+         This MSI driver supports Altera MSI to GIC controller IP.
+ 
+ config PCI_HISI
+       depends on OF && ARM64
+       bool "HiSilicon SoC HIP05 PCIe controller"
+       select PCIEPORTBUS
+       select PCIE_DW
+       help
+         Say Y here if you want PCIe controller support on HiSilicon HIP05 SoC
+ 
  endmenu

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

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

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

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