From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7FB2C22333B; Mon, 2 Jun 2025 14:02:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748872922; cv=none; b=uirNazy4zs910KfvRN2oBg2Hs/jETaR59PhKqKoSAd+XI6Unf+OW/SWZH22ZBdoZREjsjHG+yXKvMpJSmaQlE4f9jd8L3f/TtwSwJ+q0hZAu0K2Nr9hkFG8UmZhWfQxifUKLgggbXww6MSEeukn2RSSnfxzMY3oXlVlVEXRG1YA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748872922; c=relaxed/simple; bh=ZQbJytnudT4UJZrgJPgHjQDI6ugBvNSENqyNllMf/RI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hz/WE2ZpUl3LT/8QMVIKUvTF57miAlkldIoCNgv40/V43+faEmrLQFfDDOCerCj9+QQYJ/rlqrghIqYu5rdyTLnikzfZ0WZezrgcgQl+djjOrxI+ue4jK3RIsku6o6OyDGYPCgYPvvK/4rx0+y/27MMkdxFyTswWehjQn0FR6pQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=vnrVSjgj; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="vnrVSjgj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 95B79C4CEEB; Mon, 2 Jun 2025 14:02:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748872922; bh=ZQbJytnudT4UJZrgJPgHjQDI6ugBvNSENqyNllMf/RI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vnrVSjgjyoXalwrW7MOt8ymAy4Rrxz7BrLKksXFRNxoYn++DDpAyHd2gcP5yiFssE 9PTZTNfVmJZKw/V/tWuZFQUyoRzeiiSwGa7WNoaXzTIWfLgvdRSTGNA9KO4ARjZMbY WbI4pZkAaxT2Gnf7A5NX9ByZvOuomzwJP0zsQQvs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Shuah Khan , Masahiro Yamada , Johannes Berg , David Gow , Sasha Levin Subject: [PATCH 6.12 39/55] um: let make clean properly clean underlying SUBARCH as well Date: Mon, 2 Jun 2025 15:47:56 +0200 Message-ID: <20250602134239.820707279@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250602134238.271281478@linuxfoundation.org> References: <20250602134238.271281478@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Masahiro Yamada [ Upstream commit ab09da75700e9d25c7dfbc7f7934920beb5e39b9 ] Building the kernel with O= is affected by stale in-tree build artifacts. So, if the source tree is not clean, Kbuild displays the following: $ make ARCH=um O=build defconfig make[1]: Entering directory '/.../linux/build' *** *** The source tree is not clean, please run 'make ARCH=um mrproper' *** in /.../linux *** make[2]: *** [/.../linux/Makefile:673: outputmakefile] Error 1 make[1]: *** [/.../linux/Makefile:248: __sub-make] Error 2 make[1]: Leaving directory '/.../linux/build' make: *** [Makefile:248: __sub-make] Error 2 Usually, running 'make mrproper' is sufficient for cleaning the source tree for out-of-tree builds. However, building UML generates build artifacts not only in arch/um/, but also in the SUBARCH directory (i.e., arch/x86/). If in-tree stale files remain under arch/x86/, Kbuild will reuse them instead of creating new ones under the specified build directory. This commit makes 'make ARCH=um clean' recurse into the SUBARCH directory. Reported-by: Shuah Khan Closes: https://lore.kernel.org/lkml/20250502172459.14175-1-skhan@linuxfoundation.org/ Signed-off-by: Masahiro Yamada Acked-by: Johannes Berg Reviewed-by: David Gow Reviewed-by: Shuah Khan Signed-off-by: Sasha Levin --- arch/um/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/um/Makefile b/arch/um/Makefile index 00b63bac5effb..3317d87e20920 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -151,5 +151,6 @@ MRPROPER_FILES += $(HOST_DIR)/include/generated archclean: @find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \ -o -name '*.gcov' \) -type f -print | xargs rm -f + $(Q)$(MAKE) -f $(srctree)/Makefile ARCH=$(HEADER_ARCH) clean export HEADER_ARCH SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING DEV_NULL_PATH -- 2.39.5