From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 23 Jan 2025 19:04:49 +0000 (-0600)
Subject: Merge branch 'pci/aspm'
X-Git-Tag: v6.14-rc1~90^2~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=35f11c38cd29a0f64da45595ab2341002e04f55c;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'pci/aspm'

- Save parent L1 PM Substates config so when we restore it along with an
  endpoint's config, the parent info isn't junk (Jian-Hong Pan)

* pci/aspm:
  PCI/ASPM: Save parent L1SS config in pci_save_aspm_l1ss_state()
---

35f11c38cd29a0f64da45595ab2341002e04f55c