[folded-merged] dma-debug-dont-report-false-positives-with-dma_bounce_unaligned_kmalloc-v2.patch removed from -mm tree

[folded-merged] dma-debug-dont-report-false-positives-with-dma_bounce_unaligned_kmalloc-v2.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: dma-debug-dont-report-false-positives-with-dma_bounce_unaligned_kmalloc-v2
has been removed from the -mm tree.  Its filename was
     dma-debug-dont-report-false-positives-with-dma_bounce_unaligned_kmalloc-v2.patch

This patch was dropped because it was folded into dma-debug-dont-report-false-positives-with-dma_bounce_unaligned_kmalloc.patch

------------------------------------------------------
From: Marek Szyprowski <m.szyprowski@samsung.com>
Subject: dma-debug-dont-report-false-positives-with-dma_bounce_unaligned_kmalloc-v2
Date: Fri, 10 Oct 2025 19:30:09 +0200

replace is_swiotlb_allocated() with is_swiotlb_active(), per Catalin

Link: https://lkml.kernel.org/r/20251010173009.3916215-1-m.szyprowski@samsung.com
Fixes: 370645f41e6e ("dma-mapping: force bouncing if the kmalloc() size is not cache-line-aligned")
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: "Isaac J. Manjarres" <isaacmanjarres@google.com>
Cc: Robin Murohy <robin.murphy@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 kernel/dma/debug.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/kernel/dma/debug.c~dma-debug-dont-report-false-positives-with-dma_bounce_unaligned_kmalloc-v2
+++ a/kernel/dma/debug.c
@@ -597,7 +597,7 @@ static void add_dma_entry(struct dma_deb
 		global_disable = true;
 	} else if (rc == -EEXIST && !(attrs & DMA_ATTR_SKIP_CPU_SYNC) &&
 		   !(IS_ENABLED(CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC) &&
-		     is_swiotlb_allocated())) {
+		     is_swiotlb_active(entry->dev))) {
 		err_printk(entry->dev, entry,
 			"cacheline tracking EEXIST, overlapping mappings aren't supported\n");
 	}
_

Patches currently in -mm which might be from m.szyprowski@samsung.com are

dma-debug-dont-report-false-positives-with-dma_bounce_unaligned_kmalloc.patch