| Message ID | 20240301141436.77c192f9@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel+bounces-87853-ouuuleilei=gmail.com@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:7301:2097:b0:108:e6aa:91d0 with SMTP id
gs23csp830883dyb;
Thu, 29 Feb 2024 19:15:02 -0800 (PST)
X-Forwarded-Encrypted: i=3;
AJvYcCVdbaJUQKC+0wTYguBdovuAx87udDYyDNF0qhIu579bvyMQSyRotimGEw8QZTf0PbDnHu4+9JYGfgQsEYC22XCXVtWzDg==
X-Google-Smtp-Source:
AGHT+IFGL3gYqNozFSr1dgA6gV9mZ0AsNOKF1lv+lp3r1WpGBR43TPM166ZfK/FZjxbr3xczG7Qo
X-Received: by 2002:a17:906:5a53:b0:a44:9186:5303 with SMTP id
my19-20020a1709065a5300b00a4491865303mr193919ejc.19.1709262902494;
Thu, 29 Feb 2024 19:15:02 -0800 (PST)
ARC-Seal: i=2; a=rsa-sha256; t=1709262902; cv=pass;
d=google.com; s=arc-20160816;
b=a5lvPfqECZPGUonRg/mg/Z/x/z7I3ITYnMFwqC53e/TeA+9yUTsnp/ZXlfkHYxrDvG
Ox8ElQf2mMoXCjg7SB3B0OyzJav6GRwTj4d3uEv3OCRm0arV0bWzCdNIXGYSpFp6lJa+
gyjZrcDiz8RZuCrEGPuSpwM3Dj5gnQ32GIpqBhX+EyKSeNee1f+8hcMLgcPFoyz7rqUb
Mutwi2a6vHNn/EQcEpg5Pxu7p1vwMwyY3wqlajyNWaPcfKM8H6fy6gmQn98ERMKL+xTe
ilyLxYjWh/2ULmiWOLfxPaPN7XYnWheuYdYSHrpFEg+fnGXE0asELnlDTJmDRkdneK/4
qKeg==
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=EdyRsvU5kqbbF53QnWVyOMFIv55duUWubcGQP4fqOFk=;
fh=or0h4ZstamtaJJhVjS0myW/IKnrGxd6ytkB04/udnVs=;
b=NwEhk71mm+VaBcMzh5h6iFVQ/nB3dpryESiAWwH4JM3vH+k/w2nRlym8HuUMAZ84z0
oeU9HOhoA4N9TdOHlz/srO9Pgfg0GE/POwuRVYmRAj1AJfcWK6tR3CpLAxsGqxfoCpYF
jPeLuW/rcDecmDZazfswAFQ+e5yLidD6vKSKTmkTsRfdKFaFEOqG3mdt5x66vHuHGlWS
ZtC3UcBnfzLqBKoMZukXbUZtfqVebocFh7TOVH4B2Odhgtu16O2qyCaS0PwMQJuk8oaV
Bk/rC5hz5/7Nq+0YcW4jqemy9j69gJsy4EnWw259K/YOf5qL0804nQy6DPYTlREcl7DT
k9pA==;
dara=google.com
ARC-Authentication-Results: i=2; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=JtYtPMVk;
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-87853-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:4601:e00::3 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-87853-ouuuleilei=gmail.com@vger.kernel.org";
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from am.mirrors.kernel.org (am.mirrors.kernel.org.
[2604:1380:4601:e00::3])
by mx.google.com with ESMTPS id
ch14-20020a170906c2ce00b00a43d577a8b4si1099256ejb.33.2024.02.29.19.15.02
for <ouuuleilei@gmail.com>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 29 Feb 2024 19:15:02 -0800 (PST)
Received-SPF: pass (google.com: domain of
linux-kernel+bounces-87853-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=JtYtPMVk;
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-87853-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:4601:e00::3 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-87853-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 am.mirrors.kernel.org (Postfix) with ESMTPS id ED36D1F238FB
for <ouuuleilei@gmail.com>; Fri, 1 Mar 2024 03:15:01 +0000 (UTC)
Received: from localhost.localdomain (localhost.localdomain [127.0.0.1])
by smtp.subspace.kernel.org (Postfix) with ESMTP id A2B6241C85;
Fri, 1 Mar 2024 03:14:47 +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="JtYtPMVk"
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 37BFE3FE48;
Fri, 1 Mar 2024 03:14:40 +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=1709262884; cv=none;
b=P28qn7GT816iWInjn7/884rNT+VLxwsK2XEPPp1vnubLYh5mCuAua3SIbisayiBTqfXuGrLlrEeRV3x0ljHZDv36eTPenPWVJUT7b0BAhtPHh2EAg1EZVwLPoOdIr+0lOszVFyIO0/xigC82hLcE9VPp2B7abXGKPuLm4rEa9e8=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1709262884; c=relaxed/simple;
bh=8KooHiSHfy499QBK0B7dlOLyfz/tp/A8aRIHFP+v5Rc=;
h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type;
b=WByFGoFpqpVvP/RNpMuK0Zt7qCozbYsp7zA1YCVTUZmjO7uw4WCgL2fwrTsDtPRv3/eBizkbxmnKyGagHM1yUVyauddqYo45craLUm21KlmFlnQjr7KJjdHwys4w89ONf4atM4eSx7Gu0ZdJTZbpyE5F0in+TVK2reGH2M+Xldg=
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=JtYtPMVk; 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=1709262879;
bh=EdyRsvU5kqbbF53QnWVyOMFIv55duUWubcGQP4fqOFk=;
h=Date:From:To:Cc:Subject:From;
b=JtYtPMVklLt/7lVjCrghwQ3bUlKfpCoxM328WGbXRQiVDDJVm3LnFOxiu0XjXAnjm
H3bkO0m79/oo4JLBUggqcew+9Mc/EH2hsvCINq26W/vZ3sPqGCV0jz1hd/bB8N8zBW
J5gJJDYg1+mpWuaPVf+DdDlLc54fVjDViteH8Vtw0MaAdsU2raX6XVVC9b44StifyL
6sjpQUVL5aoVPsrWu/7i/8PtY3fFZFK3Jtz4n4crI8c1h4m80QIf9eELVe16y3MJwO
Rs/gESyhnwX7neP3IksZZ3LmnrQpKlM4VoN6PK6VQqGQ3NFWHK285KmVLQTV/2un5z
Nis2a9AGRQFMA==
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 4TmCqy0D7Wz4wc1;
Fri, 1 Mar 2024 14:14:37 +1100 (AEDT)
Date: Fri, 1 Mar 2024 14:14:36 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Hans de Goede <hdegoede@redhat.com>, Mark Gross <markgross@kernel.org>
Cc: Armin Wolf <W_Armin@gmx.de>,
Ilpo =?utf-8?b?SsOkcnZpbmVu?= <ilpo.jarvinen@linux.intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Mario Limonciello <mario.limonciello@amd.com>
Subject: linux-next: manual merge of the drivers-x86 tree with Linus' tree
Message-ID: <20240301141436.77c192f9@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_/ekZLYXc/fcODtbuyW6DmN.P";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1792292057138221471
X-GMAIL-MSGID: 1792292057138221471
|
| Series |
linux-next: manual merge of the drivers-x86 tree with Linus' tree
|
|
Commit Message
Stephen Rothwell
March 1, 2024, 3:14 a.m. UTC
Hi all,
Today's linux-next merge of the drivers-x86 tree got a conflict in:
drivers/platform/x86/amd/pmf/tee-if.c
between commit:
e70961505808 ("platform/x86/amd/pmf: Fixup error handling for amd_pmf_init_smart_pc()")
from Linus' tree and commit:
6ed210504a18 ("platform/x86/amd/pmf: Add missing __iomem attribute to policy_base")
from the drivers-x86 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 drivers/platform/x86/amd/pmf/tee-if.c index 8527dca9cf56,16973bebf55f..000000000000 --- a/drivers/platform/x86/amd/pmf/tee-if.c