From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 3 Jan 2024 22:18:57 +0000 (-0800)
Subject: Merge tag 'pci-v6.7-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ac865f00af293d081356bec56eea90815094a60e;p=linux.git

Merge tag 'pci-v6.7-fixes-2' of git://git./linux/kernel/git/pci/pci

Pull PCI fixes from Bjorn Helgaas:

 - Revert an ASPM patch that caused an unintended reboot when resuming
   after suspend (Bjorn Helgaas)

 - Orphan Cadence PCIe IP (Bjorn Helgaas)

* tag 'pci-v6.7-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci:
  MAINTAINERS: Orphan Cadence PCIe IP
  Revert "PCI/ASPM: Remove pcie_aspm_pm_state_change()"
---

ac865f00af293d081356bec56eea90815094a60e