From: Bjorn Helgaas <bhelgaas@google.com>
Date: Sat, 20 Oct 2018 16:45:27 +0000 (-0500)
Subject: Merge branch 'pci/aspm'
X-Git-Tag: v5.15~7755^2~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b1801bf05964321d79fbbeae96c8ab09da2e2e49;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'pci/aspm'

  - Fix ASPM link_state teardown on removal (Lukas Wunner)

  - Fix misleading _OSC ASPM message (Sinan Kaya)

  - Make _OSC optional for PCI (Sinan Kaya)

  - Don't initialize ASPM link state when ACPI_FADT_NO_ASPM is set (Patrick
    Talbert)

* pci/aspm:
  PCI/ASPM: Do not initialize link state when aspm_disabled is set
  PCI/ACPI: Allow _OSC presence to be optional for PCI
  PCI/ACPI: Correct error message for ASPM disabling
  PCI/ASPM: Fix link_state teardown on device removal
---

b1801bf05964321d79fbbeae96c8ab09da2e2e49