From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 13 Jan 2022 15:57:43 +0000 (-0600)
Subject: Merge branch 'pci/hotplug'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7475f9319adc8fc3d3fbb34e6271e4e376c4d7f7;p=linux.git

Merge branch 'pci/hotplug'

- Fix infinite loop in pciehp IRQ handler on power fault (Lukas Wunner)

- Removed commented-out ibmphp functions (Vihas Mak)

- Fix pciehp lockdep errors on Thunderbolt undock (Hans de Goede)

* pci/hotplug:
  PCI: pciehp: Use down_read/write_nested(reset_lock) to fix lockdep errors
  PCI: ibmphp: Remove commented-out functions
  PCI: pciehp: Fix infinite loop in IRQ handler upon power fault
---

7475f9319adc8fc3d3fbb34e6271e4e376c4d7f7