Merge tag 'dma-mapping-5.12' of git://git.infradead.org/users/hch/dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Feb 2021 17:54:24 +0000 (09:54 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Feb 2021 17:54:24 +0000 (09:54 -0800)
commita4dec04c7ff4307973ba502ce7b27330d9fe04b7
treefd112ec6ce9ab4a3a0c7c3e2eb67b2c9e8f6fd29
parentb817c931233b24129ac8d2c858669ee656a473dd
parent81d88ce55092edf1a1f928efb373f289c6b90efd
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
drivers/iommu/dma-iommu.c
include/linux/dma-map-ops.h
kernel/dma/mapping.c