From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 2 Apr 2020 19:26:38 +0000 (-0500)
Subject: Merge branch 'pci/misc'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=10e8141baa7c5585c2d1ad98397186689ccf99b3;p=linux.git

Merge branch 'pci/misc'

  - Move _HPX type array from stack to static data (Colin Ian King)

  - Avoid an ASMedia XHCI USB PME# defect; apparently it doesn't assert
    PME# when USB3.0 devices are hotplugged in D0 (Kai-Heng Feng)

  - Revert sysfs "rescan" file renames that broke an application (Kelsey
    Skunberg)

* pci/misc:
  PCI: sysfs: Revert "rescan" file renames
  PCI: Avoid ASMedia XHCI USB PME# from D0 defect
  PCI/ACPI: Move pcie_to_hpx3_type[] from stack to static data
---

10e8141baa7c5585c2d1ad98397186689ccf99b3