| Message ID | 20240208123022.272f57bd@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel+bounces-57371-ouuuleilei=gmail.com@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id
ma11csp2620126dyb;
Wed, 7 Feb 2024 17:32:12 -0800 (PST)
X-Google-Smtp-Source:
AGHT+IFoowCO5/yvHOBMp5LgVGYNCK8C0ApojpCxj5sDfXcEWm/KLyShFzZb+DRRly5iXK+Eri8o
X-Received: by 2002:a9d:638e:0:b0:6dc:2aa:822f with SMTP id
w14-20020a9d638e000000b006dc02aa822fmr8025753otk.30.1707355932569;
Wed, 07 Feb 2024 17:32:12 -0800 (PST)
ARC-Seal: i=2; a=rsa-sha256; t=1707355932; cv=pass;
d=google.com; s=arc-20160816;
b=ogCJLEyqzwJwhRQfS9N2oo/b6CyDNE+/bNFBFqJ86qOfOCHBykHCQ6sV4h4IhcZ7mZ
+e5Ru5xglr3DCcOqA2R6oZoQsx0czB9/RxW8Xz1X3+k5lOnlehdYr4KJp58n0mAtN2RQ
mEwZ4VCmKgZVN10JUZrK3wIQNlCZLN/oK7h7fXoK7JOETif6vl5S8kojZcTHUKfrvCR6
BkEeRjyJwygcBi71PdqrjddhsQUjfP2Uj8+Nm4WTxh/QMKTGYbIhnFx5JkSXE35iSgBg
3VhZFqLNXWd9139vtGZ7EbfswIWt+YmLp3c38T/uIuHfER+vXqkkM8VVk97vzVRBrYly
BZeQ==
ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence
:message-id:subject:cc:to:from:date:dkim-signature;
bh=hdmd2hgEp/CWvvERaKzFlKQcnW3ajQj+e4t2lGrolTQ=;
fh=eON0U/cuJ+gLlBPxQ1e6IJKYsBxRxQuhueHNqOfLfF4=;
b=rEvyAa7KshBR/nuwfirGK/rpI+2XT62kwmKUe2Q8gqisIYx/6K+ol+xnizrh+xStnE
tzF5eLEjliX8bnvSRSdM3F4ah2pr82jRPn6qmdbAv7LkRiUOj5lyQS67X/14KtM5xjL6
TjHLsAeS+IXRx7nG4ExyNyNGLilbneXF1y+PmEdejISItkwVSGg15aMddGlZ+FZHWyRX
wJfE0ZlXH2nAbovAeDGcI1QRmXOLxcnoGJ07VkNoz8RDLYaXIpGKytGXLs0PUPDXD9QX
+66VGq21reTjMv8PWRtyTQj6IxnrrEYu7QgvHPTEpKvarkqBXXGagEi8qDbV/AyuN2jP
o8Cw==;
dara=google.com
ARC-Authentication-Results: i=2; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=b5lnIEIn;
arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass
dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au);
spf=pass (google.com: domain of
linux-kernel+bounces-57371-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:45e3:2400::1 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-57371-ouuuleilei=gmail.com@vger.kernel.org";
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
X-Forwarded-Encrypted: i=2;
AJvYcCWbAF3icmEOiwxg9xN6OYiJdboGT9g1amFs6SHmu1F7WXD/+iCCdTN5ilrhp1k2IUw4W3WlbFciotg9PdEcuC7VuxR62A==
Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org.
[2604:1380:45e3:2400::1])
by mx.google.com with ESMTPS id
a29-20020a637f1d000000b005d8bc09efb4si2805980pgd.886.2024.02.07.17.32.12
for <ouuuleilei@gmail.com>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 07 Feb 2024 17:32:12 -0800 (PST)
Received-SPF: pass (google.com: domain of
linux-kernel+bounces-57371-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=b5lnIEIn;
arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass
dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au);
spf=pass (google.com: domain of
linux-kernel+bounces-57371-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:45e3:2400::1 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-57371-ouuuleilei=gmail.com@vger.kernel.org";
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org
[52.25.139.140])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by sv.mirrors.kernel.org (Postfix) with ESMTPS id 4351228442E
for <ouuuleilei@gmail.com>; Thu, 8 Feb 2024 01:32:12 +0000 (UTC)
Received: from localhost.localdomain (localhost.localdomain [127.0.0.1])
by smtp.subspace.kernel.org (Postfix) with ESMTP id 1418636133;
Thu, 8 Feb 2024 01:30:36 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au
header.b="b5lnIEIn"
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
(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 2C4201CD19;
Thu, 8 Feb 2024 01:30:28 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
arc=none smtp.client-ip=150.107.74.76
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
t=1707355831; cv=none;
b=jW7y5SP85li4WinZDkiV5b7OLzMWKhGExi7cuLqE1a1gjEfHvkhPcNZ99Q3XBJrNdSxP4kxuVaMbPecXlof2h0hTG9s99NZjkPsUKTQAcjSSJVHegQaGQ63GA/6dLoBeobKV3JmDo+GsdabuZTtWm5PzNeT/a3cyt7bRlcadGfo=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1707355831; c=relaxed/simple;
bh=muz7Bui59U4LNvcntLNkBS8HDXhspLwGzQwrxYYzZi8=;
h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type;
b=p/ci6nqlX0mkoXyjd3coZtqqsxVKnIl/OtjNsenPBDDZJRz4SwB5mv49NZiqo0LzY+OJute23utlE6AA/JhGffmcEtlUHFT5int5IqZkhNccdDTo8ll/tsmXfUahDFjGjhKV3M3qNJysa9P8CBFpzqcHw/EGtJiCGu9blOKu1KE=
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
dmarc=pass (p=none dis=none) header.from=canb.auug.org.au;
spf=pass smtp.mailfrom=canb.auug.org.au;
dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au
header.b=b5lnIEIn; arc=none smtp.client-ip=150.107.74.76
Authentication-Results: smtp.subspace.kernel.org;
dmarc=pass (p=none dis=none) header.from=canb.auug.org.au
Authentication-Results: smtp.subspace.kernel.org;
spf=pass smtp.mailfrom=canb.auug.org.au
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1707355826;
bh=hdmd2hgEp/CWvvERaKzFlKQcnW3ajQj+e4t2lGrolTQ=;
h=Date:From:To:Cc:Subject:From;
b=b5lnIEInxnjfdNPfaGUWqhToOGcRFBCZhWzMv8KOSEZUxDDcwqsPFQoohpi9zd5bQ
rzJasu/TR9MugR9V709RS806bLmPWVxIh9ddoTZ2Qj2DdrMy5VHjOdNcYv4qxOl2Ma
OWMDrt6inda4BPgupOIUncFZSkUIzNLXFdttoE0asxHKVZOVlDtRuLHYJj7JoJoGO5
i247oDdf0cfjLCF3zS/dLshHSK9YcB9TUZ/f4sutlKo1Lmq/H2t4R8G5Y2nIaAZxGF
b2DLWELQnfzouRM0QMVERsElLVjMAYY68nGdXm343+PhVOkUSrrJQsRb3vair0II67
rdPBwUHMxt1aw==
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 X25519 server-signature RSA-PSS (4096 bits) server-digest
SHA256)
(No client certificate requested)
by mail.ozlabs.org (Postfix) with ESMTPSA id 4TVfYs2J57z4wc6;
Thu, 8 Feb 2024 12:30:24 +1100 (AEDT)
Date: Thu, 8 Feb 2024 12:30:22 +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>
Cc: Ard Biesheuvel <ardb@kernel.org>, "Borislav Petkov (AMD)"
<bp@alien8.de>, Kevin Loughlin <kevinloughlin@google.com>, Linux Kernel
Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List
<linux-next@vger.kernel.org>, Nathan Chancellor <nathan@kernel.org>, Paolo
Bonzini <pbonzini@redhat.com>
Subject: linux-next: manual merge of the tip tree with Linus' tree
Message-ID: <20240208123022.272f57bd@canb.auug.org.au>
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/XuVZMLCnqmZxo2P198xFIFs";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1790292453924792914
X-GMAIL-MSGID: 1790292453924792914
|
| Series |
linux-next: manual merge of the tip tree with Linus' tree
|
|
Commit Message
Stephen Rothwell
Feb. 8, 2024, 1:30 a.m. UTC
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/x86/include/asm/coco.h
between commit:
e45964771007 ("x86/coco: Define cc_vendor without CONFIG_ARCH_HAS_CC_PLATFORM")
from Linus' tree and commit:
1c811d403afd ("x86/sev: Fix position dependent variable references in startup code")
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/include/asm/coco.h index 76c310b19b11,21940ef8d290..000000000000 --- a/arch/x86/include/asm/coco.h