From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 13 Nov 2025 02:31:22 +0000 (-0800)
Subject: Merge tag 'dma-mapping-6.18-2025-11-12' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v6.18-rc6~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92385a075a01124100edc581e3b8285268d8591e;p=thirdparty%2Fkernel%2Flinux.git

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

Pull dma-mapping fixes from Marek Szyprowski:

 - two minor fixes for DMA API infrastructure: restoring proper
   structure padding used in benchmark tests (Qinxin Xia) and global
   DMA_BIT_MASK macro rework to make it a bit more clang friendly (James
   Clark)

* tag 'dma-mapping-6.18-2025-11-12' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux:
  dma-mapping: Allow use of DMA_BIT_MASK(64) in global scope
  dma-mapping: benchmark: Restore padding to ensure uABI remained consistent
---

92385a075a01124100edc581e3b8285268d8591e