From: Linus Torvalds Date: Sun, 14 Apr 2024 17:02:40 +0000 (-0700) Subject: Merge tag 'dma-maping-6.9-2024-04-14' of git://git.infradead.org/users/hch/dma-mapping X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ddd7ad5cf1525b59c8231a6914156ebb09398cfd;p=linux.git Merge tag 'dma-maping-6.9-2024-04-14' of git://git.infradead.org/users/hch/dma-mapping Pull dma-mapping fixes from Christoph Hellwig: - fix up swiotlb buffer padding even more (Petr Tesarik) - fix for partial dma_sync on swiotlb (Michael Kelley) - swiotlb debugfs fix (Dexuan Cui) * tag 'dma-maping-6.9-2024-04-14' of git://git.infradead.org/users/hch/dma-mapping: swiotlb: do not set total_used to 0 in swiotlb_create_debugfs_files() swiotlb: fix swiotlb_bounce() to do partial sync's correctly swiotlb: extend buffer pre-padding to alloc_align_mask if necessary --- ddd7ad5cf1525b59c8231a6914156ebb09398cfd