Merge tag 'dma-mapping-5.16' of git://git.infradead.org/users/hch/dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Nov 2021 18:56:41 +0000 (10:56 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Nov 2021 18:56:41 +0000 (10:56 -0800)
commit372594985c786b40108a5201ca3192223d6c0c40
tree86ec652db339a5fa58b4b2cee3d85c2b75a22bef
parent1bdd629e5aa0e335504304be4208935948692549
parent9fbd8dc19aa57ec8fe92606043199919527cd9be
Merge tag 'dma-mapping-5.16' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping updates from Christoph Hellwig:
 "Just a small set of changes this time. The request dma_direct_alloc
  cleanups are still under review and haven't made the cut.

  Summary:

   - convert sparc32 to the generic dma-direct code

   - use bitmap_zalloc (Christophe JAILLET)"

* tag 'dma-mapping-5.16' of git://git.infradead.org/users/hch/dma-mapping:
  dma-mapping: use 'bitmap_zalloc()' when applicable
  sparc32: use DMA_DIRECT_REMAP
  sparc32: remove dma_make_coherent
  sparc32: remove the call to dma_make_coherent in arch_dma_free