From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 2 Feb 2024 20:56:56 +0000 (-0800)
Subject: Merge tag 'pci-v6.8-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b1dd6c26bca4acc145c61f98febadba64eba1877;p=linux.git

Merge tag 'pci-v6.8-fixes-1' of git://git./linux/kernel/git/pci/pci

Pull pci fixes from Bjorn Helgaas:

 - Fix a potential deadlock that was reintroduced by an ASPM revert
   merged for v6.8 (Johan Hovold)

 - Add Manivannan Sadhasivam as PCI Endpoint maintainer (Lorenzo
   Pieralisi)

* tag 'pci-v6.8-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci:
  MAINTAINERS: Add Manivannan Sadhasivam as PCI Endpoint maintainer
  PCI/ASPM: Fix deadlock when enabling ASPM
---

b1dd6c26bca4acc145c61f98febadba64eba1877