| Message ID | 20221110130920.55a7d583@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp684210wru;
Wed, 9 Nov 2022 18:36:41 -0800 (PST)
X-Google-Smtp-Source:
AMsMyM47oPQclPCDLjpaqbqX2V9KPVexqHftihfZlY73t5AEKNBBRa9HXmvGB3rvCx7ypxOz8IJk
X-Received: by 2002:a05:6a00:10d4:b0:56c:fc55:610c with SMTP id
d20-20020a056a0010d400b0056cfc55610cmr63516421pfu.6.1668047801166;
Wed, 09 Nov 2022 18:36:41 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1668047801; cv=none;
d=google.com; s=arc-20160816;
b=Swvr6A74foeU0U2UM3YTKXPR3fQyv3s//hBAvoPgY3RNVm5E2fsoxQbYykcAcWK3lz
vcvW6n6AYMXp+F/VBPKPdcJZkTDh61EkXbiydEos8ICrckijYlYCv/JMz0jCan7OYWTG
T7jX+6rtrEfN8pjcQftZ3Bu7abi+PXy8CYv+ZZuye2oU0tSxMJRePAoCp9XIwncAStL1
KqJonC60IAhII7yDRsjzy4SuXDFTtA52Q0trjb+tnQtiWmbwaX6C8/f0uVrazi/yEQCp
pf91am7I1BrAeWIkmHuW0jkZp0MauZf7HZSVZukqoBkjk68ufZr6r5ZFZKUX0yK3AI8R
nZBw==
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=yYAo6orz4PQyawTZ7XwqSAZd30ekfwNX0vXirxhu7Io=;
b=StJV4k0mU42zXyROnHuQE+WnuM40HHEpTDQUxT3JpiPs/dfIh2qmVP/6PNm5L3sws1
68t4UEq6nddqFu7t58eyOzzq0K9E4IfBhW57O6OEbyb/XmQlV9F6hfBN1EJPgRh6fHLR
8WJfGJSC3uqgIrYv/0lol0x+kTgr5Lefj8mAFyjWd/Sy35PSGQcPVFEh92OwsKgsUi2W
EACXfv8pDN5dEQGRZapIMhws72YdIeXq17mGptlEg+gbFhrBeFjrgn+mzuwycuzM/9we
KNu4WiR5kbnn5f/45QQ7AzLVxYs7dAk1uwE8/Y13pZgIzom7N9xPdcp+KUZ25ucWbsz1
9kFQ==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=uMg7Ib9z;
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
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
b11-20020a170903228b00b00175393589d6si23390820plh.205.2022.11.09.18.36.25;
Wed, 09 Nov 2022 18:36:40 -0800 (PST)
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=uMg7Ib9z;
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
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S232418AbiKJCJ1 (ORCPT <rfc822;dexuan.linux@gmail.com>
+ 99 others); Wed, 9 Nov 2022 21:09:27 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34484 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S231828AbiKJCJZ (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Wed, 9 Nov 2022 21:09:25 -0500
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 99EAFFAE0;
Wed, 9 Nov 2022 18:09:24 -0800 (PST)
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 (P-256) server-signature RSA-PSS (4096 bits)
server-digest SHA256)
(No client certificate requested)
by mail.ozlabs.org (Postfix) with ESMTPSA id 4N74yn6VjLz4xGT;
Thu, 10 Nov 2022 13:09:21 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1668046162;
bh=yYAo6orz4PQyawTZ7XwqSAZd30ekfwNX0vXirxhu7Io=;
h=Date:From:To:Cc:Subject:From;
b=uMg7Ib9z5n/UMhs/NawTAZl6UMVnz48f6bIyvSr/lMhfooUcxV2VkwzKxMC3lOqSO
Z2L7b5rKhAXDPVkkAN9PeIpmBrxmtRXMckShWJXoPVdzHykB81E/uANHunhvgjK33a
M76qvUfqYL2y43oviV5y8GSmYbceNZNOzYy9MYAw8ZQgf6GT7/fwJUR9h4t2JavKmM
H7+TG9unPQEtTgCa5l+HhI56vk8yUtrs9UPJ0MlWrFc2GBF2By7dTGN+uuzcis3NXq
pBtCLrrvP5DLkQQRUJ6aGEUkUSPb4OARI7XR6hlDyJuOgBLThxc9JipXtnf7Je2vNL
R+DPRtWeAZRtA==
Date: Thu, 10 Nov 2022 13:09:20 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Paolo Bonzini <pbonzini@redhat.com>
Cc: KVM <kvm@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the tip tree with the kvm-fixes tree
Message-ID: <20221110130920.55a7d583@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/I/CbxKwYia5swyvyn4Bfs1N";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,SPF_PASS 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1749074890950046306?=
X-GMAIL-MSGID: =?utf-8?q?1749074890950046306?=
|
| Series |
linux-next: manual merge of the tip tree with the kvm-fixes tree
|
|
Commit Message
Stephen Rothwell
Nov. 10, 2022, 2:09 a.m. UTC
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/x86/kernel/asm-offsets.c
between commit:
debc5a1ec0d1 ("KVM: x86: use a separate asm-offsets.c file")
from the kvm-fixes tree and commits:
c063a217bc07 ("x86/percpu: Move current_top_of_stack next to current_task")
5d8213864ade ("x86/retbleed: Add SKL return thunk")
from the tip tree.
I fixed it up (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/kernel/asm-offsets.c index 437308004ef2,13afdbbee349..000000000000 --- a/arch/x86/kernel/asm-offsets.c