From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 11 Apr 2020 18:34:36 +0000 (-0700)
Subject: Merge tag 'dma-mapping-5.7-1' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Tag: v5.7-rc1~11
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=75e71883979c2c173ef2530a8b90a629f17f3107;p=linux-block.git

Merge tag 'dma-mapping-5.7-1' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping fixes from Christoph Hellwig:

 - fix an integer truncation in dma_direct_get_required_mask
   (Kishon Vijay Abraham)

 - fix the display of dma mapping types (Grygorii Strashko)

* tag 'dma-mapping-5.7-1' of git://git.infradead.org/users/hch/dma-mapping:
  dma-debug: fix displaying of dma allocation type
  dma-direct: fix data truncation in dma_direct_get_required_mask()
---

75e71883979c2c173ef2530a8b90a629f17f3107