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)
  - 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()

1  2 
include/linux/pci.h

Simple merge