Merge tag 'dma-mapping-5.11' of git://git.infradead.org/users/hch/dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Dec 2020 21:19:43 +0000 (13:19 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Dec 2020 21:19:43 +0000 (13:19 -0800)
commit347d81b68b8f7044c9ce3fefa130a736ca916176
treeee07d2f350f34ae0a8bdd904251faa61144cb778
parent4f06f210673e6841439a0f91fcde64960cdbeb5c
parent7679325702c90aecd393cd7cde685576c14489c0
Merge tag 'dma-mapping-5.11' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping updates from Christoph Hellwig:

 - support for a partial IOMMU bypass (Alexey Kardashevskiy)

 - add a DMA API benchmark (Barry Song)

 - misc fixes (Tiezhu Yang, tangjianqiang)

* tag 'dma-mapping-5.11' of git://git.infradead.org/users/hch/dma-mapping:
  selftests/dma: add test application for DMA_MAP_BENCHMARK
  dma-mapping: add benchmark support for streaming DMA APIs
  dma-contiguous: fix a typo error in a comment
  dma-pool: no need to check return value of debugfs_create functions
  powerpc/dma: Fallback to dma_ops when persistent memory present
  dma-mapping: Allow mixing bypass and mapped DMA operation
MAINTAINERS
arch/powerpc/Kconfig
include/linux/dma-map-ops.h
kernel/dma/Kconfig
kernel/dma/Makefile