From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 C66F04334AB; Sat, 12 Sep 2026 10:43:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789209801; cv=none; b=u2PNzavKJ0mjykBZHzGTQ2NhFdzqEkZfxqDy3ZL8IPp1HYnzq556CxTuqUtadZf83N7Y3ScG0DsJR5ytj5VoW9NFx+4B1y7uN3KVQ/4sFVQomJJHW+hZXERrLoN+EixxZuxG3UNXNFk4uYXizS0sjDtoNmHNLWYM931PDqtIYm8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789209801; c=relaxed/simple; bh=E8xNADJo4hJvCq8mn/R9SNbyGHyXulahcQ6iCW9Pv9s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pSlnpXo4iXlhash8pJinb7qYqgAZ77fROyJUiJjFRKbBITPw95xiyI7gGj0nyrbolVLO0wqovFUeRPQsKnNtBwtycRaZSTmJSOhLzgAAbwsPMQpejwaMHqh8OoRgMBH3uKYd+cooq+e1DZ4vKMqcbcItXSfE6//qT8PMAxM/4MQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=kdabUUBL; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="kdabUUBL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BFBFB1F000FF; Sat, 12 Sep 2026 10:43:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789209794; bh=yi8IdUYwpgG5XPglO4N7bDt8zQHqtujCvJKR8oXMNd8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=kdabUUBLG5+U7dBoZEbCUkqCigxGuFbOpkBttetSWADQYY+eborkMTlebttTmqlTq SgAMDnAJxNo3MgVgMoE43SoRqFt4UnoCL2KUHJXjuO9Xz0XCTVbfs1HzZuetSB06ad we5asjShU6cgGdUrMBL6LcL8BV7QT7FjFGQc5Utg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yuntao Wang , Nathan Chancellor , Nicolas Schier , Sasha Levin Subject: [PATCH 6.18 0894/1518] kbuild: fix modules.builtin(.modinfo) targets in the top-level Makefile Date: Sat, 12 Sep 2026 08:51:03 +0200 Message-ID: <20260912065643.676970075@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065623.398859879@linuxfoundation.org> References: <20260912065623.398859879@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yuntao Wang [ Upstream commit 69ef27076d19297c0bf3bd22171fab8d87464a09 ] Commit 7a342e6c7735 ("kbuild: move modules.builtin(.modinfo) rules to Makefile.vmlinux_o") moved the modules.builtin(.modinfo) rules from link-vmlinux.sh to Makefile.vmlinux_o, and added the corresponding targets to the top-level Makefile. Commit 39cfd5b12160 ("kbuild: extract modules.builtin.modinfo from vmlinux.unstripped") later moved these rules from Makefile.vmlinux_o to Makefile.vmlinux, but left the corresponding targets in the top-level Makefile unchanged. These modules.builtin(.modinfo) targets in the top-level Makefile should be moved alongside the vmlinux target, since they are now generated by Makefile.vmlinux. However, simply removing these trivial targets might be a better choice, as it makes the Makefile cleaner and avoids the need to keep them in sync across multiple files, reducing the chance of future mistakes. Fixes: 39cfd5b12160 ("kbuild: extract modules.builtin.modinfo from vmlinux.unstripped") Signed-off-by: Yuntao Wang Reviewed-by: Nathan Chancellor Link: https://patch.msgid.link/20260729071737.818007-1-yuntao.wang@linux.dev Signed-off-by: Nicolas Schier Signed-off-by: Sasha Levin --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 392e92c29d42e..a04fe733e1648 100644 --- a/Makefile +++ b/Makefile @@ -1252,7 +1252,7 @@ PHONY += vmlinux_o vmlinux_o: vmlinux.a $(KBUILD_VMLINUX_LIBS) $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.vmlinux_o -vmlinux.o modules.builtin.modinfo modules.builtin: vmlinux_o +vmlinux.o: vmlinux_o @: PHONY += vmlinux -- 2.53.0