Merge tag 'pci-v5.11-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Feb 2021 00:05:40 +0000 (16:05 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Feb 2021 00:05:40 +0000 (16:05 -0800)
commitdd86e7fa07a3ec33c92c957ea7b642c4702516a0
tree5a5d0845f948b0b094ea2c3245069c819ae8f57e
parent5c279c4cf206e03995e04fd3404fa95ffd243a97
parent40fb68c7725aee024ed99ad38504f5d25820c6f0
Merge tag 'pci-v5.11-fixes-2' of git://git./linux/kernel/git/helgaas/pci

Pull PCI fix from Bjorn Helgaas:
 "Revert ASPM suspend/resume fix that regressed NVMe devices (Bjorn
  Helgaas)"

* tag 'pci-v5.11-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  Revert "PCI/ASPM: Save/restore L1SS Capability for suspend/resume"