From: Linus Torvalds Date: Fri, 10 Nov 2023 19:09:07 +0000 (-0800) Subject: Merge tag 'dma-mapping-6.7-2023-11-10' of git://git.infradead.org/users/hch/dma-mapping X-Git-Tag: nvme-6.7-2023-12-01~49 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=391ce5b9c46ebf23cd049bb552a899dfc0cfb838;p=nvme.git Merge tag 'dma-mapping-6.7-2023-11-10' of git://git.infradead.org/users/hch/dma-mapping Pull dma-mapping fixes from Christoph Hellwig: - don't leave pages decrypted for DMA in encrypted memory setups linger around on failure (Petr Tesarik) - fix an out of bounds access in the new dynamic swiotlb code (Petr Tesarik) - fix dma_addressing_limited for systems with weird physical memory layouts (Jia He) * tag 'dma-mapping-6.7-2023-11-10' of git://git.infradead.org/users/hch/dma-mapping: swiotlb: fix out-of-bounds TLB allocations with CONFIG_SWIOTLB_DYNAMIC dma-mapping: fix dma_addressing_limited() if dma_range_map can't cover all system RAM dma-mapping: move dma_addressing_limited() out of line swiotlb: do not free decrypted pages if dynamic --- 391ce5b9c46ebf23cd049bb552a899dfc0cfb838