From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 31 Jan 2018 16:10:31 +0000 (-0600)
Subject: Merge branch 'pci/hotplug' into next
X-Git-Tag: v4.16-rc1~60^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=85d24b3fc22265d51aa6e8c9e73552750089fa49;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'pci/hotplug' into next

* pci/hotplug:
  PCI: pciehp: Assume NoCompl+ for Thunderbolt ports
  PCI: hotplug: Drop checking of PCI_BRIDGE_CONTROL in *_unconfigure_device()
---

85d24b3fc22265d51aa6e8c9e73552750089fa49