From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 14 Nov 2017 18:11:22 +0000 (-0600)
Subject: Merge branch 'pci/hotplug' into next
X-Git-Tag: v4.15-rc1~95^2~21
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8d666e53e07ac4562eb8ef73c1904d88522fcb8b;p=uclinux-h8%2Flinux.git

Merge branch 'pci/hotplug' into next

* pci/hotplug:
  PCI: pciehp: Do not clear Presence Detect Changed during initialization
  PCI: pciehp: Fix race condition handling surprise link down
  PCI: Distribute available resources to hotplug-capable bridges
  PCI: Distribute available buses to hotplug-capable bridges
  PCI: Do not allocate more buses than available in parent
  PCI: Open-code the two pass loop when scanning bridges
  PCI: Move pci_hp_add_bridge() to drivers/pci/probe.c
  PCI: Add for_each_pci_bridge() helper
  PCI: shpchp: Convert timers to use timer_setup()
  PCI: cpqphp: Convert timers to use timer_setup()
  PCI: pciehp: Convert timers to use timer_setup()
  PCI: ibmphp: Use common error handling code in unconfigure_boot_device()
---

8d666e53e07ac4562eb8ef73c1904d88522fcb8b