From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 6 Mar 2019 21:30:12 +0000 (-0600)
Subject: Merge branch 'pci/hotplug'
X-Git-Tag: v5.1-rc1~87^2~12
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=58a79db4818296a609f4ab8335f707fa5e60787e;p=linux.git

Merge branch 'pci/hotplug'

  - Reorder pciehp cached state/hardware state updates to avoid missed
    interrupts (Mika Westerberg)

  - Turn ibmphp semaphores into completions or mutexes (Arnd Bergmann)

* pci/hotplug:
  PCI: ibmphp: Turn semaphores into completions or mutexes
  PCI: pciehp: Assign ctrl->slot_ctrl before writing it to hardware
---

58a79db4818296a609f4ab8335f707fa5e60787e