From nobody Thu Feb 12 10:55:44 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 A329526AE4; Thu, 13 Jun 2024 08:41:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718268110; cv=none; b=eWT4WciF80nOALngo8cdMixlz/7obvXPOTRhemsE7FVObDTGEgzJIpST+e9yiGrXk0WpGg3122IaAk2EtPmN7LPEsbcFL+Ld02akSpmYRk0VgLh1UsO6FqJ/opjin5R79tFefBZMyS6jgUvbxfpmgurpjwj/4bF2HGdFIuXChpE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718268110; c=relaxed/simple; bh=1ZJ/uxN8Pb7qwYIgbsTKzzdLKnI4ejAlfOoGuc1Nl6A=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=HTB7lZqA1ocj8pS5BJar/swymLXVbb6o83Lp58KJO0eBW4H+NyTTMM6z545qYaEDH4n1hFIONfOoOQxSKujXD2KNi9xqpCTWDjLHS8FOZRiHI1MiDlXfJzVvw2UTRL9ugbRRvrjgySSKFb1DZqtBXtEUlAEj5xhEMVtaGaGVXZc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=J17GTGLY; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=FtkKBH20; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="J17GTGLY"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="FtkKBH20" Date: Thu, 13 Jun 2024 08:41:46 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1718268106; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=05oMZ/uaU2LNUMzjQkqwNiFcFWF1pVwE3ycVjjdx3f0=; b=J17GTGLY0h9QF8mqNBHCSAKz2rR8jhbG2pfBLmpsVAKDpAToGLlTWklsUz9WM770F0j4NW etOt7GRO/JE2RAJ6IBPeVEe10JRK0kr1L2bAi33FIppsT4t60z4Mu/zCh0BSDuTLWZ9bpb ka822TwfHdyidqh4JKL78lkPYIhM9MdpjBKEE8UOwEU6rBEcaVqKcqFKTd0b9uf46xqqY3 j1JceW7A2UwRAHZsHuLiWRyqYUl+qKiaUEZkKR86GUSSJGBuc/EHDEpmJTMfQNr1/qiKdr ZtUPrF+dVKJp/R87DK2IZZxtKvZ1Dg9oiDJe9KuN4GmImM7fg47YI7LR40N31A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1718268106; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=05oMZ/uaU2LNUMzjQkqwNiFcFWF1pVwE3ycVjjdx3f0=; b=FtkKBH203/SnzCcJbfsbZo+LZ6t2VVS5XrYxcnApx/u1nMo2Ji+i2ei6nbv86ZlmhNMzg+ 3hwpZ0ecfvmc0qDw== From: "tip-bot2 for Benjamin Segall" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/urgent] x86/boot: Don't add the EFI stub to targets, again Cc: Ben Segall , "Borislav Petkov (AMD)" , Ard Biesheuvel , stable@vger.kernel.org, #@tip-bot2.tec.linutronix.de, v6.1+@tip-bot2.tec.linutronix.de, x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <171826810609.10875.7242823258662782011.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the x86/urgent branch of tip: Commit-ID: b2747f108b8034271fd5289bd8f3a7003e0775a3 Gitweb: https://git.kernel.org/tip/b2747f108b8034271fd5289bd8f3a7003= e0775a3 Author: Benjamin Segall AuthorDate: Wed, 12 Jun 2024 12:44:44 -07:00 Committer: Borislav Petkov (AMD) CommitterDate: Thu, 13 Jun 2024 10:32:36 +02:00 x86/boot: Don't add the EFI stub to targets, again This is a re-commit of da05b143a308 ("x86/boot: Don't add the EFI stub to targets") after the tagged patch incorrectly reverted it. vmlinux-objs-y is added to targets, with an assumption that they are all relative to $(obj); adding a $(objtree)/drivers/... path causes the build to incorrectly create a useless arch/x86/boot/compressed/drivers/... directory tree. Fix this just by using a different make variable for the EFI stub. Fixes: cb8bda8ad443 ("x86/boot/compressed: Rename efi_thunk_64.S to efi-mix= ed.S") Signed-off-by: Ben Segall Signed-off-by: Borislav Petkov (AMD) Reviewed-by: Ard Biesheuvel Cc: stable@vger.kernel.org # v6.1+ Link: https://lore.kernel.org/r/xm267ceukksz.fsf@bsegall.svl.corp.google.com --- arch/x86/boot/compressed/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/M= akefile index 243ee86..f205164 100644 --- a/arch/x86/boot/compressed/Makefile +++ b/arch/x86/boot/compressed/Makefile @@ -105,9 +105,9 @@ vmlinux-objs-$(CONFIG_UNACCEPTED_MEMORY) +=3D $(obj)/me= m.o =20 vmlinux-objs-$(CONFIG_EFI) +=3D $(obj)/efi.o vmlinux-objs-$(CONFIG_EFI_MIXED) +=3D $(obj)/efi_mixed.o -vmlinux-objs-$(CONFIG_EFI_STUB) +=3D $(objtree)/drivers/firmware/efi/libst= ub/lib.a +vmlinux-libs-$(CONFIG_EFI_STUB) +=3D $(objtree)/drivers/firmware/efi/libst= ub/lib.a =20 -$(obj)/vmlinux: $(vmlinux-objs-y) FORCE +$(obj)/vmlinux: $(vmlinux-objs-y) $(vmlinux-libs-y) FORCE $(call if_changed,ld) =20 OBJCOPYFLAGS_vmlinux.bin :=3D -R .comment -S