[folded-merged] mm-cma-drop-config_cma_debug-fix.patch removed from -mm tree

[Andrew Morton <akpm@linux-foundation.org>]

The quilt patch titled
     Subject: dma-contiguous: remove debug code to removed CONFIG_CMA_DEBUG
has been removed from the -mm tree.  Its filename was
     mm-cma-drop-config_cma_debug-fix.patch

This patch was dropped because it was folded into mm-cma-drop-config_cma_debug.patch

------------------------------------------------------
From: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Subject: dma-contiguous: remove debug code to removed CONFIG_CMA_DEBUG
Date: Wed, 7 Feb 2024 15:38:25 +0100

Commit acc2f3e42d4a ("mm/cma: drop CONFIG_CMA_DEBUG") removes the config
CMA_DEBUG and the debug code in cma.c, but misses debug code in
kernel/dma/contiguous.c.

Remove this dead code from this removed config option.

Link: https://lkml.kernel.org/r/20240207143825.986-1-lukas.bulwahn@gmail.com
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 kernel/dma/contiguous.c |    6 ------
 1 file changed, 6 deletions(-)

--- a/kernel/dma/contiguous.c~mm-cma-drop-config_cma_debug-fix
+++ a/kernel/dma/contiguous.c
@@ -37,12 +37,6 @@
 
 #define pr_fmt(fmt) "cma: " fmt
 
-#ifdef CONFIG_CMA_DEBUG
-#ifndef DEBUG
-#  define DEBUG
-#endif
-#endif
-
 #include <asm/page.h>
 
 #include <linux/memblock.h>
_

Patches currently in -mm which might be from lukas.bulwahn@gmail.com are

maple_tree-avoid-duplicate-variable-init-in-mast_spanning_rebalance.patch
mempolicy-clean-up-minor-dead-code-in-queue_pages_test_walk.patch
mm-cma-drop-config_cma_debug.patch