From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 12 Jul 2019 22:08:27 +0000 (-0500)
Subject: Merge branch 'pci/peer-to-peer'
X-Git-Tag: v5.4.17~3130^2~14
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3306e99edf70e9f7f9839c0c680136f098ebb1ed;p=arm%2Flinux.git

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

3306e99edf70e9f7f9839c0c680136f098ebb1ed