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)
commit3306e99edf70e9f7f9839c0c680136f098ebb1ed
tree057e78c23be211f3b8090d2d3a1eaa2fa4904efc
parente09977285c1929867c9f251d28bda9aed78fe331
parent9c002bb66f5bd8b8f470926489a115b7f486f501
Merge branch 'pci/peer-to-peer'

  - 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