From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 26 Oct 2019 10:29:04 +0000 (-0400)
Subject: Merge tag 'dma-mapping-5.4-2' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=964f9cfaaee31588b1f1a23edee8bed94136452a;p=linux.git

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

964f9cfaaee31588b1f1a23edee8bed94136452a