From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 4 Apr 2018 18:27:42 +0000 (-0500)
Subject: Merge branch 'pci/hotplug'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a5c6ad7840e1a37c2111612d96d99a5edb6e5502;p=linux.git

Merge branch 'pci/hotplug'

  - fix possible cpqphp NULL pointer dereference (Shawn Lin)

  - rescan more of the hierarchy on ACPI hotplug to fix Thunderbolt/xHCI
    hotplug (Mika Westerberg)

* pci/hotplug:
  ACPI / hotplug / PCI: Check presence of slot itself in get_slot_status()
  PCI: cpqphp: Fix possible NULL pointer dereference
---

a5c6ad7840e1a37c2111612d96d99a5edb6e5502