Merge branch 'pci/hotplug'
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 4 Apr 2018 18:27:42 +0000 (13:27 -0500)
committerBjorn Helgaas <helgaas@kernel.org>
Wed, 4 Apr 2018 18:27:42 +0000 (13:27 -0500)
commita5c6ad7840e1a37c2111612d96d99a5edb6e5502
treebc0614f57ba8bc0245bfb5d6ff9b73978c78691b
parent315271b0ff1976e8c4a1c2620cef39047a003390
parent13d3047c81505cc0fb9bdae7810676e70523c8bf
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