From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 9 Nov 2021 18:56:41 +0000 (-0800)
Subject: Merge tag 'dma-mapping-5.16' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Tag: xarray-5.18~617
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=372594985c786b40108a5201ca3192223d6c0c40;p=users%2Fwilly%2Fxarray.git

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

372594985c786b40108a5201ca3192223d6c0c40