From: Linus Torvalds Date: Wed, 8 May 2024 16:37:58 +0000 (-0700) Subject: Merge tag 'pci-v6.9-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1ab1a19db13cdd05f9df4760e42a1f2f52f13439;p=users%2Fdwmw2%2Flinux.git Merge tag 'pci-v6.9-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci Pull pci fixes from Bjorn Helgaas: - Update kernel-parameters doc to describe "pcie_aspm=off" more accurately (Bjorn Helgaas) - Restore the parent's (not the child's) ASPM state to the parent during resume, which fixes a reboot during resume (Kai-Heng Feng) * tag 'pci-v6.9-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci: PCI/ASPM: Restore parent state to parent, child state to child PCI/ASPM: Clarify that pcie_aspm=off means leave ASPM untouched --- 1ab1a19db13cdd05f9df4760e42a1f2f52f13439