From patchwork Wed Aug 9 02:15:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 133053 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2549315vqr; Tue, 8 Aug 2023 21:01:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEuaVsUh32wPl367LaxWJiI5PsOA92W3jDPtg1ZV+6wqlWtmbFHo17jbAkctMQ3Zpv19DBS X-Received: by 2002:a1f:3d95:0:b0:487:c95:e789 with SMTP id k143-20020a1f3d95000000b004870c95e789mr2198742vka.4.1691553694023; Tue, 08 Aug 2023 21:01:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691553693; cv=none; d=google.com; s=arc-20160816; b=ljVg9nu/syMZUlno6mYg4q/nWykNuzFbs1RI+ccnHaK6zhxUmrtviggLwQQ6DvZpAz njNnOmTAYXa4+P0MtLzJ9R4+i7TxeDz71cHKjpTkCu0cNgK6tjIoTaKHfeTDJaCN4kmq qVZhi7yoVbRlvReak9ZXCnfpISM80x5OIhIHLsi57bLsvo4BxurhdmLp1DorN1VH+wBN y8gBlfpB1vuAySU8kkn3u+PHB45vZnhe+F06Rc42JqKdkvU7y6A+rKPkphS92Qm3qvSn WN3OqmKj6KihNux8Z6AageCu7ISJZbn+6aBTtMcfAHAYtdRfb4SEzwRoRcjz8mf04L36 pcKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=WwhPpUPIIJ1F0bzlOpEW0k9XGC15BGNZygV8v9njSAE=; fh=ZraYvpMuAwv1l1NtSJko0MI2k8yhpuv5UKoA0FUxx8Y=; b=MN59ArtK5+afPFiJ8DIRMfB+LTo25olUvO66wXAx3JaY9vfBNi8vrmIh57B6HyTfkX zg3DxknVUq7Et/utxLqxMDODSvOjMiN2qVCr/Cnozhg9HkAA/0ZrsXDaclpo+V8OIiSd DtveyFwqYN0P+IvRtZSxpZazdCO3IVVEv5cUGx2OUqkdUupRCXfrRgnTBfeyAPR+TPDb qPu7P3d/jQ9X6th0rkclqC0UPLZGXTXvFawMwr5fBECoMenwdOjC9E/fIYsFbhO2ABRB GOl753TL4RraQKwaNOMyGqYervNsYL1GbbXwT7uQlCHIRhae8Hx3uuoBeDZgJD+ElwxT Tb2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=FzAQ4+Ae; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z11-20020a6552cb000000b0055c82716d17si7509341pgp.830.2023.08.08.21.01.18; Tue, 08 Aug 2023 21:01:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=FzAQ4+Ae; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229658AbjHICPi (ORCPT + 99 others); Tue, 8 Aug 2023 22:15:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229674AbjHICPh (ORCPT ); Tue, 8 Aug 2023 22:15:37 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 54A391FF5; Tue, 8 Aug 2023 19:15:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1691547314; bh=WwhPpUPIIJ1F0bzlOpEW0k9XGC15BGNZygV8v9njSAE=; h=Date:From:To:Cc:Subject:From; b=FzAQ4+AeQxDY6ihN3HVgV1vJKNN6sy3W7x/3QDDV8wpqpi8jgllQsMvLvBmQAuOXX /Wkt3zh+fv1tgX4QVNPMlQaHoUhFSE9WcTpe+wsweOi8gQR6MNT4Ebv77U7Ewt0q9n X/JXDfMIzIY5+7JHmkNz6YtZSvsC/i8kPx6CMoZizupybRpS4fGP5CZZrllajw2fQ/ a0EEWiBbh8NBswd4rESwQ4R1+EUv5HdTOcSKLjHjg1qVVACYLOcT/vhCnH02fhw9N6 e+grgUiMeBE6RTinHaA1TJemgHTolPP7Mob2Ck94o2ajtL1t4a9HVKxLFT68KcZQ9I t3W6eoxsn2nBg== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4RLDD069zFz4wqX; Wed, 9 Aug 2023 12:15:12 +1000 (AEST) Date: Wed, 9 Aug 2023 12:15:11 +1000 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: Arnd Bergmann , "Borislav Petkov (AMD)" , Linux Kernel Mailing List , Linux Next Mailing List , Petr Pavlu Subject: linux-next: manual merge of the tip tree with Linus' tree Message-ID: <20230809121511.683222bc@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773722605926449532 X-GMAIL-MSGID: 1773722605926449532 Hi all, Today's linux-next merge of the tip tree got conflicts in: arch/x86/include/asm/processor.h arch/x86/kernel/vmlinux.lds.S arch/x86/lib/retpoline.S between commits: fb3bd914b3ec ("x86/srso: Add a Speculative RAS Overflow mitigation") 3bbbe97ad83d ("x86/srso: Add a forgotten NOENDBR annotation") from Linus' tree and commits: 566ffa3ae964 ("x86/cpu: Fix amd_check_microcode() declaration") 973ab2d61f33 ("x86/retpoline,kprobes: Fix position of thunk sections with CONFIG_LTO_CLANG") 029239c5b0e6 ("x86/retpoline,kprobes: Skip optprobe check for indirect jumps with retpolines and IBT") from the tip tree. I fixed it up (I think - see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc arch/x86/include/asm/processor.h index 7c67db7c9f53,36d52075fdad..000000000000 --- a/arch/x86/include/asm/processor.h diff --cc arch/x86/kernel/vmlinux.lds.S index e76813230192,dd5b0a68cf84..000000000000 --- a/arch/x86/kernel/vmlinux.lds.S diff --cc arch/x86/lib/retpoline.S index 2cff585f22f2,3bea96341d00..000000000000 --- a/arch/x86/lib/retpoline.S