From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 28 Nov 2025 01:29:15 +0000 (-0800)
Subject: Merge tag 'dma-mapping-6.18-2025-11-27' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v6.18~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aa7243aaf1947a0cb54c44337795d6759493fe02;p=thirdparty%2Flinux.git

Merge tag 'dma-mapping-6.18-2025-11-27' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux

Pull dma-mapping fixes from Marek Szyprowski:
 "Two last minute fixes for the recently modified DMA API infrastructure:

   - proper handling of DMA_ATTR_MMIO in dma_iova_unlink() function (me)

   - regression fix for the code refactoring related to P2PDMA (Pranjal
     Shrivastava)"

* tag 'dma-mapping-6.18-2025-11-27' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux:
  dma-direct: Fix missing sg_dma_len assignment in P2PDMA bus mappings
  iommu/dma: add missing support for DMA_ATTR_MMIO for dma_iova_unlink()
---

aa7243aaf1947a0cb54c44337795d6759493fe02