From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 12 Jan 2022 18:08:11 +0000 (-0800)
Subject: Merge tag 'dma-mapping-5.17' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Tag: v6.6.17~8440
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7e7b69654724c72bd3219b71f58937845dca0b2b;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull dma-mapping updates from Christoph Hellwig:

 - refactor the dma-direct coherent allocator

 - turn an macro into an inline in scatterlist.h (Logan Gunthorpe)

* tag 'dma-mapping-5.17' of git://git.infradead.org/users/hch/dma-mapping:
  lib/scatterlist: cleanup macros into static inline functions
  dma-direct: add a dma_direct_use_pool helper
  dma-direct: factor the swiotlb code out of __dma_direct_alloc_pages
  dma-direct: drop two CONFIG_DMA_RESTRICTED_POOL conditionals
  dma-direct: warn if there is no pool for force unencrypted allocations
  dma-direct: fail allocations that can't be made coherent
  dma-direct: refactor the !coherent checks in dma_direct_alloc
  dma-direct: factor out a helper for DMA_ATTR_NO_KERNEL_MAPPING allocations
  dma-direct: clean up the remapping checks in dma_direct_alloc
  dma-direct: always leak memory that can't be re-encrypted
  dma-direct: don't call dma_set_decrypted for remapped allocations
  dma-direct: factor out dma_set_{de,en}crypted helpers
---

7e7b69654724c72bd3219b71f58937845dca0b2b