Merge tag 'dma-mapping-5.3-4' of git://git.infradead.org/users/hch/dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Aug 2019 17:31:11 +0000 (10:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Aug 2019 17:31:11 +0000 (10:31 -0700)
commite83b009c5c366b678c7986fa6c1d38fed06c954c
treea7cc0449b32c7086ba44441dfac547a3940528be
parentb5e33e44d994bb03c75f1901d47b1cf971f752a0
parent33dcb37cef741294b481f4d889a465b8091f11bf
Merge tag 'dma-mapping-5.3-4' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping fixes from Christoph Hellwig:

 - fix the handling of the bus_dma_mask in dma_get_required_mask, which
   caused a regression in this merge window (Lucas Stach)

 - fix a regression in the handling of DMA_ATTR_NO_KERNEL_MAPPING (me)

 - fix dma_mmap_coherent to not cause page attribute mismatches on
   coherent architectures like x86 (me)

* tag 'dma-mapping-5.3-4' of git://git.infradead.org/users/hch/dma-mapping:
  dma-mapping: fix page attributes for dma_mmap_*
  dma-direct: don't truncate dma_required_mask to bus addressing capabilities
  dma-direct: fix DMA_ATTR_NO_KERNEL_MAPPING
drivers/iommu/dma-iommu.c