]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'remotes/lorenzo/pci/host-generic'
authorBjorn Helgaas <bhelgaas@google.com>
Thu, 4 Jun 2020 17:59:16 +0000 (12:59 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Thu, 4 Jun 2020 17:59:16 +0000 (12:59 -0500)
commit7aba517d8f6431d5bcb0363ba056f4092b425f5b
tree05b6e3b71ec742b52896c3ce6d87469b8aad7a15
parentcf4d5a41a6f8a4d6dff86d96f7dc1fc930adf120
parent252ec385fc9ea1b1442f00ac6702d3a09b598e46
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
drivers/pci/controller/dwc/pcie-hisi.c
drivers/pci/controller/pcie-tango.c
drivers/pci/setup-bus.c
include/linux/pci-acpi.h