From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 16 May 2024 23:14:09 +0000 (-0500)
Subject: Merge branch 'pci/aspm'
X-Git-Tag: v6.10-rc1~76^2~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6faf3f450ecdb084128751e8fda0e515283da39;p=thirdparty%2Flinux.git

Merge branch 'pci/aspm'

- Consolidate #defines for link states (L0s, L1, L1.1, etc) to simplify
  ASPM implementation (Ilpo Järvinen)

- Simplify ASPM disable/enable mask calculation (Ilpo Järvinen)

* pci/aspm:
  PCI/ASPM: Clean up ASPM disable/enable mask calculation
  PCI/ASPM: Consolidate link state defines
---

a6faf3f450ecdb084128751e8fda0e515283da39