Merge branch 'pci/virtualization'
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 2 Jan 2019 21:31:06 +0000 (15:31 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 2 Jan 2019 21:31:06 +0000 (15:31 -0600)
commit6ee86cac1cc415031b443d8b584305696a300d1e
tree7aa14c4e08128d3b0709658b814cbbdaa01fe006
parent54aed1909db69f9b160bf36dd4ec314f0c91b56a
parent7dc20ab1b9c431b792a6fe1e78baf36b63edc5e3
Merge branch 'pci/virtualization'

  - Skip VF scanning on powerpc, which does this in firmware (Sebastian
    Ott)

* pci/virtualization:
  s390/pci: skip VF scanning
  PCI/IOV: Add flag so platforms can skip VF scanning
  PCI/IOV: Factor out sriov_add_vfs()
include/linux/pci.h