]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitf07ef77e78ece60f03a3035d99af19bba4812841
treea7cc0449b32c7086ba44441dfac547a3940528be
parent86534daf6ecd774363879bd15472faf262a36bb7
parentd9b501bceeb009a5d1a4446fccd3adbf5769aa3c
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