Merge branch 'remotes/lorenzo/pci/host-generic'

  - Constify struct pci_ecam_ops (Rob Herring)

  - Support building as modules (Rob Herring)

  - Eliminate wrappers for pci_host_common_probe() by using DT match table
    data (Rob Herring)

* remotes/lorenzo/pci/host-generic:
  PCI: host-generic: Eliminate pci_host_common_probe wrappers
  PCI: host-generic: Support building as modules
  PCI: Constify struct pci_ecam_ops

# Conflicts:
#	drivers/pci/controller/dwc/pcie-hisi.c

diff --cc drivers/pci/controller/dwc/pcie-hisi.c
index 11f5ff7,0ba50fb..0ad4e07
--- 1/drivers/pci/controller/dwc/pcie-hisi.c
--- 2/drivers/pci/controller/dwc/pcie-hisi.c
+++ b/drivers/pci/controller/dwc/pcie-hisi.c
@@@ -362,7 -353,7 +353,7 @@@ static int hisi_pcie_platform_init(stru
        return 0;
  }
  
- static struct pci_ecam_ops hisi_pcie_platform_ops = {
 -const struct pci_ecam_ops hisi_pcie_platform_ops = {
++static const struct pci_ecam_ops hisi_pcie_platform_ops = {
        .bus_shift    = 20,
        .init         =  hisi_pcie_platform_init,
        .pci_ops      = {

diff --cc drivers/pci/controller/pcie-tango.c
Simple merge

diff --cc drivers/pci/setup-bus.c
Simple merge

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