From: Bjorn Helgaas <bhelgaas@google.com>
Date: Sat, 10 Dec 2022 16:36:32 +0000 (-0600)
Subject: Merge branch 'pci/hotplug'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=84c3482963c8011d0d817fe1ddde28fbab321ae8;p=linux.git

Merge branch 'pci/hotplug'

- Enable pciehp by default if USB4 is enabled because USB4/Thunderbolt
  tunneling depends on native PCIe hotplug (Albert Zhou)

- Make sure pciehp binds only to Downstream Ports, not Upstream Ports
  (Rafael J. Wysocki)

- Remove unused get_mode1_ECC_cap callback in shpchp (Ian Cowan)

- Enable pciehp Command Completed Interrupt only if supported to reduce
  confusion when looking at lspci output (Pali Rohár)

* pci/hotplug:
  PCI: pciehp: Enable Command Completed Interrupt only if supported
  PCI: shpchp: Remove unused get_mode1_ECC_cap callback
  PCI: acpiphp: Avoid setting is_hotplug_bridge for PCIe Upstream Ports
  PCI/portdrv: Set PCIE_PORT_SERVICE_HP for Root and Downstream Ports only
  PCI: pciehp: Enable by default if USB4 enabled
---

84c3482963c8011d0d817fe1ddde28fbab321ae8