From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 24 Mar 2024 17:45:31 +0000 (-0700)
Subject: Merge tag 'dma-mapping-6.9-2024-03-24' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Tag: v6.9-rc1~4
X-Git-Url: http://git.samba.org/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=864ad046c15758747809d9397cae621540493bcb

Merge tag 'dma-mapping-6.9-2024-03-24' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping fixes from Christoph Hellwig:
 "This has a set of swiotlb alignment fixes for sometimes very long
  standing bugs from Will. We've been discussion them for a while and
  they should be solid now"

* tag 'dma-mapping-6.9-2024-03-24' of git://git.infradead.org/users/hch/dma-mapping:
  swiotlb: Reinstate page-alignment for mappings >= PAGE_SIZE
  iommu/dma: Force swiotlb_max_mapping_size on an untrusted device
  swiotlb: Fix alignment checks when both allocation and DMA masks are present
  swiotlb: Honour dma_alloc_coherent() alignment in swiotlb_alloc()
  swiotlb: Enforce page alignment in swiotlb_alloc()
  swiotlb: Fix double-allocation of slots due to broken alignment handling
---

864ad046c15758747809d9397cae621540493bcb