From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 31 Jan 2018 16:10:30 +0000 (-0600)
Subject: Merge branch 'pci/enumeration' into next
X-Git-Tag: pci-v4.16-changes~15
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5be31686cf4752443e669f48843eed036c69f999;p=users%2Fdwmw2%2Flinux.git

Merge branch 'pci/enumeration' into next

* pci/enumeration:
  RDMA/qedr: Use pci_enable_atomic_ops_to_root()
  PCI: Add pci_enable_atomic_ops_to_root()
  PCI: Make PCI_SCAN_ALL_PCIE_DEVS work for Root as well as Downstream Ports
---

5be31686cf4752443e669f48843eed036c69f999