From nobody Mon Apr 6 18:55:15 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 61F2C3806B4; Wed, 18 Mar 2026 08:25:25 +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=1773822327; cv=none; b=sea5IDXfJZFHRFbmcMn3Mg0G0ZeIM9AdmJ0cADqXuSX1bodFfomd+WeIPuPPJJTY3Oy4el/qC8nMFM/CT9uyfBRzrl7CalOj+l3zMqnxwu5AEQXZALMYFG/vhSMhR36lu6hZylou9uKUxs+0F78+M8VmGpQ4kvAyLb3PpD2ovxU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773822327; c=relaxed/simple; bh=/eS3PmUWbvKkfpWGxJ/4hJlw2n+d5rSCV3jpT7G6h1I=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=QLwJUGYxl6YxvAUqHnge/+JyCGDLpFf2sysjcOKCXeA0qy3+JW5cYX02gzSaL55eFII02/kPODoGQ/54GuIQkF8CvV4TMBQMFcCSe/4gyjT2bkBCsDNCFHYEBaM7+0LXqxYL/uPoW+db9/Wp5RvEtvqObMAF5Ktx2wdlv3diy74= 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=ffWz45fn; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=aJHJYmhy; 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="ffWz45fn"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="aJHJYmhy" Date: Wed, 18 Mar 2026 08:25:22 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1773822324; 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=XveO/fXvZ/rJD3sjdEyOX20489eH7SCpZJRzNhCnRcY=; b=ffWz45fnWu9/z9L7EJA56IYAuRM4SGH/VFfUEgBKmSGTf8Z+mxb9USrHPlF6/NzXH7Dv1w KnrbhjmDWSskvJggWN/PAV6JqUnSNVz+ErwTt0b3tZ/S/IY5zsW2yCdoNA+8/xQJ2ha2QK NheU/h48Fbo3C3mxFP6lrJQiGH38AiJ4M4ApDuBKId/JhiPMQps+kXm2t5zJfMQ7YM79Vz ppN5NjKf3P7kidInytgpvhBBn5+J7ikLq6Kyivwpd7Ln6js8oYX5pNJwR9ZvSgJOkznOKz 8ZEnNrs175kf6/Ilbbl7IPPOc558XY6okuOuatxp+sWfeCtTJ0z9WYlmACyTQQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1773822324; 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=XveO/fXvZ/rJD3sjdEyOX20489eH7SCpZJRzNhCnRcY=; b=aJHJYmhybnteGgbmB68dbBW7Mexg3aQpTLpixCFfIAmCG/yvYDbZBsrKcxq4hHdN9ILM7l cLGGW5f7HaadBZDw== From: "tip-bot2 for Josh Poimboeuf" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: objtool/urgent] livepatch/klp-build: Fix inconsistent kernel version Cc: Joe Lawrence , Josh Poimboeuf , Song Liu , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260310203751.1479229-10-joe.lawrence@redhat.com> References: <20260310203751.1479229-10-joe.lawrence@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <177382232276.1647592.18413030649973622287.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 objtool/urgent branch of tip: Commit-ID: 6f93f7b06810d04acc6b106a7d5ecd6000f80545 Gitweb: https://git.kernel.org/tip/6f93f7b06810d04acc6b106a7d5ecd600= 0f80545 Author: Josh Poimboeuf AuthorDate: Tue, 10 Mar 2026 16:37:48 -04:00 Committer: Josh Poimboeuf CommitterDate: Mon, 16 Mar 2026 12:50:17 -07:00 livepatch/klp-build: Fix inconsistent kernel version If .config hasn't been synced with auto.conf, any recent changes to CONFIG_LOCALVERSION* may not get reflected in the kernel version name. Use "make syncconfig" to force them to sync, and "make -s kernelrelease" to get the version instead of having to construct it manually. Fixes: 24ebfcd65a87 ("livepatch/klp-build: Introduce klp-build script for g= enerating livepatch modules") Closes: https://lore.kernel.org/20260217160645.3434685-10-joe.lawrence@redh= at.com Reported-by: Joe Lawrence Signed-off-by: Josh Poimboeuf Signed-off-by: Joe Lawrence Acked-by: Song Liu Link: https://patch.msgid.link/20260310203751.1479229-10-joe.lawrence@redha= t.com Signed-off-by: Josh Poimboeuf --- scripts/livepatch/klp-build | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/livepatch/klp-build b/scripts/livepatch/klp-build index 809e198..7b82c75 100755 --- a/scripts/livepatch/klp-build +++ b/scripts/livepatch/klp-build @@ -285,15 +285,14 @@ set_module_name() { # application from appending it with '+' due to a dirty git working tree. set_kernelversion() { local file=3D"$SRC/scripts/setlocalversion" - local localversion + local kernelrelease =20 stash_file "$file" =20 - localversion=3D"$(cd "$SRC" && make --no-print-directory kernelversion)" - localversion=3D"$(cd "$SRC" && KERNELVERSION=3D"$localversion" ./scripts/= setlocalversion)" - [[ -z "$localversion" ]] && die "setlocalversion failed" + kernelrelease=3D"$(cd "$SRC" && make syncconfig &>/dev/null && make -s ke= rnelrelease)" + [[ -z "$kernelrelease" ]] && die "failed to get kernel version" =20 - sed -i "2i echo $localversion; exit 0" scripts/setlocalversion + sed -i "2i echo $kernelrelease; exit 0" scripts/setlocalversion } =20 get_patch_files() {