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

diff --cc drivers/pci/probe.c
Simple merge

diff --cc include/linux/pci.h
Simple merge

diff --cc include/uapi/linux/pci_regs.h
Simple merge