From: Linus Torvalds Date: Sat, 30 Sep 2023 18:07:26 +0000 (-0700) Subject: Merge tag 'dma-mapping-6.6-2023-09-30' of git://git.infradead.org/users/hch/dma-mapping X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3b517966c5616ac011081153482a5ba0e91b17ff;p=linux.git Merge tag 'dma-mapping-6.6-2023-09-30' of git://git.infradead.org/users/hch/dma-mapping Pull dma-mapping fixes from Christoph Hellwig: - fix the narea calculation in swiotlb initialization (Ross Lagerwall) - fix the check whether a device has used swiotlb (Petr Tesarik) * tag 'dma-mapping-6.6-2023-09-30' of git://git.infradead.org/users/hch/dma-mapping: swiotlb: fix the check whether a device has used software IO TLB swiotlb: use the calculated number of areas --- 3b517966c5616ac011081153482a5ba0e91b17ff