From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CEB9EC83F15 for ; Wed, 30 Aug 2023 19:29:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344362AbjH3T1N (ORCPT ); Wed, 30 Aug 2023 15:27:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56446 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244197AbjH3MoK (ORCPT ); Wed, 30 Aug 2023 08:44:10 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B86E7C2 for ; Wed, 30 Aug 2023 05:44:07 -0700 (PDT) From: Thomas Gleixner DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1693399446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=IEJ0kVid6YqL1aDp6RJNTR0lXoi8C1JegKTmw5SjuPE=; b=QZhzdJIkfj1YfdFg4Qyn4Z16vShF9sBoWGqtOZUic29tVNJ1iQERbQIEySMdN4h6fTl1mv IUNaSYZ3DyvPPR+MtWoawO9YlsEcOWEYVqSkHvNZ3mF4pXZxBpBSkBkBu7yPZSR/0Da02A 3jfpmXLowIQi3APh7DY2KHCVJlwJRyx2vjNQLNUcjrl+7DfjaQ9QvNywmEwCrrxtiomuJR 7qYzIdctvf8zW9gDxXxTtlN3sMbqO5iBmjW+1qlJ05ojYhbZUteg8SwCraWtkLjWr6gWJW JoNACggRd7J38oS/47miquUYYZUFYXimGdaY3siYSeAdjwV67p/4Lr89+E4HBw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1693399446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=IEJ0kVid6YqL1aDp6RJNTR0lXoi8C1JegKTmw5SjuPE=; b=PjDko05vyLXnVOTPrmRAuRJhGXfrA7lJyA0jlh/dbJcroQy3aYtj2zxUZt5Y4sxplJkyF5 f5cw4Nf+UqcwfIBw== To: Borislav Petkov Cc: Linus Torvalds , linux-kernel@vger.kernel.org, x86@kernel.org Subject: Re: [GIT pull] x86/core for v6.6-rc1 In-Reply-To: <20230830112742.GAZO8nrn75B2V5qIk2@fat_crate.local> References: <169339202558.475946.15795543318941920393.tglx@xen13> <20230830112742.GAZO8nrn75B2V5qIk2@fat_crate.local> Date: Wed, 30 Aug 2023 14:44:06 +0200 Message-ID: <87o7io66p5.ffs@tglx> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Aug 30 2023 at 13:27, Borislav Petkov wrote: > On Wed, Aug 30, 2023 at 12:40:46PM +0200, Thomas Gleixner wrote: >> Petr Pavlu (2): >> x86/retpoline,kprobes: Fix position of thunk sections with CONFIG_LTO_CLANG >> x86/retpoline,kprobes: Skip optprobe check for indirect jumps with retpolines and IBT > > So those two went upstream earlier, as part of the urgent lineup, see: > > commit bf98bae3d8a18745e54fef9fd71fd129f6e9f7e5 > Merge: 4e7ffde6984a 6405b72e8d17 > Author: Linus Torvalds > Date: Sat Aug 19 10:46:02 2023 +0200 > > and I've zapped them from x86/core. Duh. > You probably should update your local x86/core copy and resend the pull. Let me do that.