[folded-merged] kho-adopt-radix-tree-for-preserved-memory-tracking-fix.patch removed from -mm tree

[folded-merged] kho-adopt-radix-tree-for-preserved-memory-tracking-fix.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: kho: fix child node parsing for debugfs in/sub_fdts
has been removed from the -mm tree.  Its filename was
     kho-adopt-radix-tree-for-preserved-memory-tracking-fix.patch

This patch was dropped because it was folded into kho-adopt-radix-tree-for-preserved-memory-tracking.patch

------------------------------------------------------
From: Ran Xiaokai <ran.xiaokai@zte.com.cn>
Subject: kho: fix child node parsing for debugfs in/sub_fdts
Date: Mon, 9 Mar 2026 03:35:30 +0000

Commit e0c1731f5d57 ("kho: adopt radix tree for preserved memory
tracking") changed KHO_FDT_SUB_TREE_PROP_NAME from "fdt" to
"preserved-data".  However, kho debugfs code still hard-coded the "fdt"
string when parsing the device tree, causing the debugfs node
/debugfs/kho/in/sub_fdts/ fail to parse child nodes correctly.

Fix this by including the header file and using KHO_FDT_SUB_TREE_PROP_NAME
instead of the hard-coded string.

Link: https://lkml.kernel.org/r/20260309033530.244508-1-ranxiaokai627@163.com
Signed-off-by: Ran Xiaokai <ran.xiaokai@zte.com.cn>
Reviewed-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Cc: Alexander Graf <graf@amazon.com>
Cc: Baoquan He <bhe@redhat.com>
Cc: Changyuan Lyu <changyuanl@google.com>
Cc: David Matlack <dmatlack@google.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Jason Gunthorpe <jgg@nvidia.com>
Cc: Jason Miu <jasonmiu@google.com>
Cc: Pasha Tatashin <pasha.tatashin@soleen.com>
Cc: Pratyush Yadav <pratyush@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 kernel/liveupdate/kexec_handover_debugfs.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/kernel/liveupdate/kexec_handover_debugfs.c~kho-adopt-radix-tree-for-preserved-memory-tracking-fix
+++ a/kernel/liveupdate/kexec_handover_debugfs.c
@@ -13,6 +13,7 @@
 #include <linux/io.h>
 #include <linux/libfdt.h>
 #include <linux/mm.h>
+#include <linux/kho/abi/kexec_handover.h>
 #include "kexec_handover_internal.h"
 
 static struct dentry *debugfs_root;
@@ -139,7 +140,7 @@ __init void kho_in_debugfs_init(struct k
 		const char *name = fdt_get_name(fdt, child, NULL);
 		const u64 *fdt_phys;
 
-		fdt_phys = fdt_getprop(fdt, child, "fdt", &len);
+		fdt_phys = fdt_getprop(fdt, child, KHO_FDT_SUB_TREE_PROP_NAME, &len);
 		if (!fdt_phys)
 			continue;
 		if (len != sizeof(*fdt_phys)) {
_

Patches currently in -mm which might be from ran.xiaokai@zte.com.cn are

kho-adopt-radix-tree-for-preserved-memory-tracking.patch