From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 Dec 2020 21:19:43 +0000 (-0800)
Subject: Merge tag 'dma-mapping-5.11' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=347d81b68b8f7044c9ce3fefa130a736ca916176;p=kernel.git

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
---

347d81b68b8f7044c9ce3fefa130a736ca916176