From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 24 Feb 2021 17:54:24 +0000 (-0800)
Subject: Merge tag 'dma-mapping-5.12' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Tag: v5.12-rc1~48
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/a4dec04c7ff4307973ba502ce7b27330d9fe04b7

Merge tag 'dma-mapping-5.12' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping updates from Christoph Hellwig:

 - add support to emulate processing delays in the DMA API benchmark
   selftest (Barry Song)

 - remove support for non-contiguous noncoherent allocations, which
   aren't used and will be replaced by a different API

* tag 'dma-mapping-5.12' of git://git.infradead.org/users/hch/dma-mapping:
  dma-mapping: remove the {alloc,free}_noncoherent methods
  dma-mapping: benchmark: pretend DMA is transmitting
---

a4dec04c7ff4307973ba502ce7b27330d9fe04b7