The patch titled Subject: dma-contiguous: remove debug code to removed CONFIG_CMA_DEBUG has been added to the -mm mm-unstable branch. Its filename is mm-cma-drop-config_cma_debug-fix.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-cma-drop-config_cma_debug-fix.patch This patch will later appear in the mm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Lukas Bulwahn <lukas.bulwahn@xxxxxxxxx> 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@xxxxxxxxx Signed-off-by: Lukas Bulwahn <lukas.bulwahn@xxxxxxxxx> Cc: Anshuman Khandual <anshuman.khandual@xxxxxxx> Cc: Christoph Hellwig <hch@xxxxxx> Cc: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx> Cc: Robin Murphy <robin.murphy@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- 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@xxxxxxxxx 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-fix.patch