From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 5 Nov 2021 16:28:43 +0000 (-0500)
Subject: Merge branch 'pci/hotplug'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4917f7189bd8be326d0910055b029d3cbf50256c;p=linux.git

Merge branch 'pci/hotplug'

- Ignore Link Down/Up caused by error-induced Hot Reset so endpoint driver
  can remain bound to device during error recovery (Lukas Wunner)

- Remove unused resume err_handler (Lukas Wunner)

- Remove unused pcie_port_bus_{,un}register() declarations (Lukas Wunner)

- Skip compiling err.c when CONFIG_PCIEAER not set (Lukas Wunner)

* pci/hotplug:
  PCI/ERR: Reduce compile time for CONFIG_PCIEAER=n
  PCI/portdrv: Remove unused pcie_port_bus_{,un}register() declarations
  PCI/portdrv: Remove unused resume err_handler
  PCI: pciehp: Ignore Link Down/Up caused by error-induced Hot Reset
  PCI/portdrv: Rename pm_iter() to pcie_port_device_iter()
---

4917f7189bd8be326d0910055b029d3cbf50256c