| Message ID | 20231023155606.247fa998@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1077328vqx;
Sun, 22 Oct 2023 21:56:22 -0700 (PDT)
X-Google-Smtp-Source:
AGHT+IFcoILsVIxdTOgPFOdfg91J3nVIlqOtCnjCL0E1hlH+pa5WNfT5Oxp9mxeUr6lk9NLg0ofJ
X-Received: by 2002:a05:620a:29ca:b0:779:d143:c1a7 with SMTP id
s10-20020a05620a29ca00b00779d143c1a7mr3680951qkp.26.1698036982504;
Sun, 22 Oct 2023 21:56:22 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1698036982; cv=none;
d=google.com; s=arc-20160816;
b=JJNzJCDagSvoofFZ8bP5lnGTfDc4C2OWfsgWwELQjcJyH6L339sv2T7QetS4+Q0eC0
JEv6D1OSeNc0fxgECH2BCo7t5cg1zff57b8CIbxzlZf4+g+Jx466Djt9zn/LN3ygIHi7
A20d7HyySHAFC31umMjbz0B1yJ+Im2uHKc8at6eqSiTQHPDSprAzjfpn7HRhaIfWhUM0
GKMxxT9amjuIhKjIOmNpb7MzUx520LWyEXeW6qnYH+itogPTUNjF6r2OzBZz0T5dY4AH
0ss+q4YqN+0rIRo0KpOckl1cEDUeLG85cNCXsKiAk0b4KlZtMSJwdxOG/ssd/s50niay
u0eQ==
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=Ke4ba6atseiCGvNMRr/6znd5xtFRbtHUZz7Nfd0RhdA=;
fh=RTW/LC8HGgdtf4f1VRB2cz6sP79Ide1I9of3IfUTqwI=;
b=jTW/W/0ooyrAH/W2UZ8AdkhdMSeSlHuhNSpdREgOI+eoXnOMEDCL05ertpNBDT+JU6
/aAl3Kx5c++MW/uT624661YoUbCdbyEQsLMqd0RrXjjsepVV1mE9F0zCGUko8Ny/QiBK
lmi0NlDvWen4MhyrQCdl6fbg3AWfQgXOVSBkY2z4cA+m/Cpl26Z/Q4xj4/fQ7mrHUbh2
ADDa+iKEpb5/zzd7tdgZmmspmqZTMFvAgP0W1VBZJWBYuyvd7f8SgnM4B+gPf2BP2oTq
0KHhaRVNE3mUAKEeBED5uzN1xZ4QleMpEwiqQk7tAP5+mr4x40OV0YEtKs5yMGjkIZCS
gFqQ==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=LLO7UO65;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7])
by mx.google.com with ESMTPS id
h184-20020a6383c1000000b005ad5178d053si5710816pge.347.2023.10.22.21.56.22
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 22 Oct 2023 21:56:22 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:7 as permitted sender)
client-ip=2620:137:e000::3:7;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=LLO7UO65;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:7 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 (depot.vger.email [IPv6:2620:137:e000::3:0])
by snail.vger.email (Postfix) with ESMTP id 9657A80978A4;
Sun, 22 Oct 2023 21:56:21 -0700 (PDT)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S229547AbjJWE4R (ORCPT <rfc822;a1648639935@gmail.com>
+ 26 others); Mon, 23 Oct 2023 00:56:17 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48698 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229450AbjJWE4O (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Mon, 23 Oct 2023 00:56:14 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5EAC0E8;
Sun, 22 Oct 2023 21:56:12 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1698036971;
bh=Ke4ba6atseiCGvNMRr/6znd5xtFRbtHUZz7Nfd0RhdA=;
h=Date:From:To:Cc:Subject:From;
b=LLO7UO65CQSyEzJX1LilTBbq237FrMpbkgF4VAnw07wbiFcUpFESRACMoy//fZSH0
CDUyM5y9il2yconpoCpwR7YGEktpMn0lxbs6Mt304gTFNmId/ZEEml9ApLPQLEv1ww
C2A0/wEOZ7u0vM5oUpHGp2HGXqjzWl6Zw9O7zNpppPGlAjtPAgnWUfHvWMCWprkYHx
kwp2Ohji9ldBpEjtdrsQXC4X0xNcEm2hS940mRtro7S21if/ziPWD3SmhOY98vHzen
pO85SMgYKK22EtlZllljJ0zicgHJzKbahkABNFy3vgF82QiPqDLs3T2LLmf7woUWBA
//ff/B+PpmZLg==
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 4SDNF44qKcz4wcN;
Mon, 23 Oct 2023 15:56:08 +1100 (AEDT)
Date: Mon, 23 Oct 2023 15:56:06 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jason Gunthorpe <jgg@nvidia.com>, Joerg Roedel <joro@8bytes.org>
Cc: Jason Gunthorpe <jgg@ziepe.ca>,
Jiapeng Chong <jiapeng.chong@linux.alibaba.com>,
Joao Martins <joao.m.martins@oracle.com>,
Joerg Roedel <jroedel@suse.de>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Lu Baolu <baolu.lu@linux.intel.com>
Subject: linux-next: manual merge of the iommufd tree with the iommu tree
Message-ID: <20231023155606.247fa998@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/i8kNvNtmyJ2frJSNEGZqtf8";
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,RCVD_IN_DNSWL_BLOCKED,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-Greylist: Sender passed SPF test,
not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]);
Sun, 22 Oct 2023 21:56:21 -0700 (PDT)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1780520827141405666
X-GMAIL-MSGID: 1780520827141405666
|
| Series |
linux-next: manual merge of the iommufd tree with the iommu tree
|
|
Commit Message
Stephen Rothwell
Oct. 23, 2023, 4:56 a.m. UTC
Hi all,
Today's linux-next merge of the iommufd tree got a conflict in:
drivers/iommu/intel/pasid.c
between commit:
c61c255e114c ("iommu/vt-d: Remove unused function")
from the iommu tree and commit:
3c576c995219 ("iommu/intel: Access/Dirty bit support for SL domains")
from the iommufd 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/iommu/intel/pasid.c index 06ddb3c927f5,b9264b9174e8..000000000000 --- a/drivers/iommu/intel/pasid.c