From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 22 May 2026 13:16:00 +0000 (-0700)
Subject: Merge tag 'dma-mapping-7.1-2026-05-22' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v7.1-rc5~37
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=1c04dcd891c011839f57d0501e9bc473cc0aae7d;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'dma-mapping-7.1-2026-05-22' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux

Pull dma-mapping fixes from Marek Szyprowski:
 "Two minor updates for the DMA-mapping code, mainly fixing some rare
  corner cases (Petr Tesarik, Jianpeng Chang)"

* tag 'dma-mapping-7.1-2026-05-22' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux:
  dma-mapping: move dma_map_resource() sanity check into debug code
  dma-direct: fix use of max_pfn
---

1c04dcd891c011839f57d0501e9bc473cc0aae7d