Merge tag 'dma-mapping-5.7-1' of git://git.infradead.org/users/hch/dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Apr 2020 18:34:36 +0000 (11:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Apr 2020 18:34:36 +0000 (11:34 -0700)
commit75e71883979c2c173ef2530a8b90a629f17f3107
tree3d06320f0c1db7d42d338e12d5188eb92ebf19ef
parentb753101a4ac0b906064a72feec43f5b80a1fe2e5
parent9bb50ed7470944238ec8e30a94ef096caf9056ee
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()