From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 2 Jan 2019 21:31:06 +0000 (-0600)
Subject: Merge branch 'pci/virtualization'
X-Git-Tag: v5.0-rc1~17^2~6
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=6ee86cac1cc415031b443d8b584305696a300d1e;p=linux-2.6-block.git

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

6ee86cac1cc415031b443d8b584305696a300d1e