Merge tag 'dma-mapping-5.4-2' of git://git.infradead.org/users/hch/dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Oct 2019 10:29:04 +0000 (06:29 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Oct 2019 10:29:04 +0000 (06:29 -0400)
commit964f9cfaaee31588b1f1a23edee8bed94136452a
tree613d766a3f3b1e76576be242ea8bb25b5d1c3c08
parent485fc4b69cd28f295947535175c147b943b0b2e4
parent9c24eaf81cc44d4bb38081c99eafd72ed85cf7f3
Merge tag 'dma-mapping-5.4-2' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping fix from Christoph Hellwig:
 "Fix a regression in the intel-iommu get_required_mask conversion
  (Arvind Sankar)"

* tag 'dma-mapping-5.4-2' of git://git.infradead.org/users/hch/dma-mapping:
  iommu/vt-d: Return the correct dma mask when we are bypassing the IOMMU