Merge branch 'pci/peer-to-peer'
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 12 Jul 2019 22:08:27 +0000 (17:08 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Fri, 12 Jul 2019 22:08:27 +0000 (17:08 -0500)
  - Prevent drivers that use dma_virt_ops from using peer-to-peer DMA
    (Logan Gunthorpe)

* pci/peer-to-peer:
  PCI/P2PDMA: Fix missing check for dma_virt_ops


Trivial merge