Merge tag 'dma-mapping-6.17-2025-08-28' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Aug 2025 23:04:14 +0000 (16:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Aug 2025 23:04:14 +0000 (16:04 -0700)
commit4d28e280981337360b20ac9812bf0eab9224d5a3
tree6b7356ffb2d3e83a26e7b1177853ad84f33429df
parent5b9f3b013b33e73c6f8f2bbdc6b3fd87745b40af
parent89a2d212bdb4bc29bed8e7077abe054b801137ea
Merge tag 'dma-mapping-6.17-2025-08-28' of git://git./linux/kernel/git/mszyprowski/linux

Pull dma-mapping fixes from Marek Szyprowski:

 - another small fix for arm64 systems with memory encryption (Shanker
   Donthineni)

 - fix for arm32 systems with non-standard CMA configuration (Oreoluwa
   Babatunde)

* tag 'dma-mapping-6.17-2025-08-28' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux:
  dma/pool: Ensure DMA_DIRECT_REMAP allocations are decrypted
  of: reserved_mem: Restructure call site for dma_contiguous_early_fixup()
drivers/of/of_reserved_mem.c