FAILED: patch "[PATCH] um: Use HOST_DIR for mrproper" failed to apply to 5.4-stable tree

FAILED: patch "[PATCH] um: Use HOST_DIR for mrproper" failed to apply to 5.4-stable tree

[gregkh]

The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.

To reproduce the conflict and resubmit, you may use the following commands:

git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y
git checkout FETCH_HEAD
git cherry-pick -x a5a319ec2c2236bb96d147c16196d2f1f3799301
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2023071621-diary-henchman-76a2@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^..

Possible dependencies:

a5a319ec2c22 ("um: Use HOST_DIR for mrproper")
0663c68c4d2d ("kbuild: remove {CLEAN,MRPROPER,DISTCLEAN}_DIRS")
610134b750bb ("kbuild: remove misleading stale FIXME comment")
63ec90f18204 ("um: ensure `make ARCH=um mrproper` removes arch/$(SUBARCH)/include/generated/")
8b41fc4454e3 ("kbuild: create modules.builtin without Makefile.modbuiltin or tristate.conf")
b1fbfcb4a209 ("kbuild: make single target builds even faster")
bbc55bded4aa ("modpost: dump missing namespaces into a single modules.nsdeps file")
0241ea8cae19 ("modpost: free ns_deps_buf.p after writing ns_deps files")
bff9c62b5d20 ("modpost: do not invoke extra modpost for nsdeps")
35e046a203ee ("kbuild: remove unneeded variable, single-all")
39808e451fdf ("kbuild: do not read $(KBUILD_EXTMOD)/Module.symvers")
1747269ab016 ("modpost: do not parse vmlinux for external module builds")
fab546e6cd7a ("kbuild: update comments in scripts/Makefile.modpost")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From a5a319ec2c2236bb96d147c16196d2f1f3799301 Mon Sep 17 00:00:00 2001
From: Kees Cook <keescook@chromium.org>
Date: Tue, 6 Jun 2023 15:24:45 -0700
Subject: [PATCH] um: Use HOST_DIR for mrproper

When HEADER_ARCH was introduced, the MRPROPER_FILES (then MRPROPER_DIRS)
list wasn't adjusted, leaving SUBARCH as part of the path argument.
This resulted in the "mrproper" target not cleaning up arch/x86/... when
SUBARCH was specified. Since HOST_DIR is arch/$(HEADER_ARCH), use it
instead to get the correct path.

Cc: Richard Weinberger <richard@nod.at>
Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Azeem Shaikh <azeemshaikh38@gmail.com>
Cc: linux-um@lists.infradead.org
Fixes: 7bbe7204e937 ("um: merge Makefile-{i386,x86_64}")
Cc: stable@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20230606222442.never.807-kees@kernel.org

diff --git a/arch/um/Makefile b/arch/um/Makefile
index 8186d4761bda..da4d5256af2f 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -149,7 +149,7 @@ export CFLAGS_vmlinux := $(LINK-y) $(LINK_WRAPS) $(LD_FLAGS_CMDLINE) $(CC_FLAGS_
 # When cleaning we don't include .config, so we don't include
 # TT or skas makefiles and don't clean skas_ptregs.h.
 CLEAN_FILES += linux x.i gmon.out
-MRPROPER_FILES += arch/$(SUBARCH)/include/generated
+MRPROPER_FILES += $(HOST_DIR)/include/generated
 
 archclean:
 	@find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \