| Message ID | 20231026142733.442e18a5@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp397929vqb;
Wed, 25 Oct 2023 20:28:00 -0700 (PDT)
X-Google-Smtp-Source:
AGHT+IELML+KoQa6YrNcCVlmi2X/tUq5X9rhm97RH7XX8ClYFRjF9hE1iK4pyeiweHXgsoeOfUhC
X-Received: by 2002:a67:e013:0:b0:457:b9da:db12 with SMTP id
c19-20020a67e013000000b00457b9dadb12mr15099617vsl.12.1698290880607;
Wed, 25 Oct 2023 20:28:00 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1698290880; cv=none;
d=google.com; s=arc-20160816;
b=FWcBy0fYcBDYmUi+AvF/H3SSDK3F+s93LxF6Zv6SN+SuvSNYgE++Jqeg74cTubc/YY
UueJ8ikZ0UUS8fFuIxiXQEXfucv4TCMmK0R9ucQIxdCOT9qVFfs5uq+wGqOSBzUEErFJ
8t/WzwkhB1Olta9m9g3/9+YkTmwB/Hl6VpRon27Kmx+JcgxRkTTxDzYenyYrkXvUos/Y
qbFS+Ms2VI08WhgA3RDC087ZabHWZuy9NL6eVwMcO1nVdlyM/StTo3vJ00+Si1mLMJFy
/fR0KJOV6AbDI3ppqXcy+z1zvY6wZkvo80SZm79iLH4+6h+ohN18HSC9kLR9ULm7ND1J
zBmA==
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=uZcN/okWIB4ryLnAV48yQVnuFynysUqMSeAVPBsSjyQ=;
fh=/CDMt74qtvcyArOqu6AkNlTgBaLiBhjtncGhAHGQJHI=;
b=moLhwYyKGIh5QZh3zNS0ejlNcyYWd0FIjOpdjzwW57QmXZLdCEiwv7iR0MS2pRn5RV
e19GHoKm0r+3rvIzGZcRlDdApyAIbWBS2WHSWRNnaStBxagNJF4jHGpuud0REtJfGWkY
yWw8+HWhYS4LfHUyLsNuvOVDzscTpcsdHylZdWMYlkr5JN0VjKcNo6c+xUT4rMM8bsnT
Rw2/8+RnG8PIDZ3EvhSrKAUwEOO4gWBFNJp+Au5SoJW3+kcqm1KuW3fZHFt8wjRriVNI
kKVrUEWbC5Ugseaps7kgU8JpBAAnnVrqpccgGZPP/l6YuheqpSfwjA5M5OAh0shGo+Zv
KjLw==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Ot91u8+x;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:2 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 agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2])
by mx.google.com with ESMTPS id
y71-20020a25dc4a000000b00da052f70069si5787795ybe.11.2023.10.25.20.28.00
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 25 Oct 2023 20:28:00 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:2 as permitted sender)
client-ip=2620:137:e000::3:2;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Ot91u8+x;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:2 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 agentk.vger.email (Postfix) with ESMTP id 09EB18104997;
Wed, 25 Oct 2023 20:27:58 -0700 (PDT)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S229596AbjJZD1r (ORCPT <rfc822;a1648639935@gmail.com>
+ 25 others); Wed, 25 Oct 2023 23:27:47 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52924 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229554AbjJZD1p (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Wed, 25 Oct 2023 23:27:45 -0400
Received: from gandalf.ozlabs.org (mail.ozlabs.org
[IPv6:2404:9400:2221:ea00::3])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6DAE3187;
Wed, 25 Oct 2023 20:27:42 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1698290857;
bh=uZcN/okWIB4ryLnAV48yQVnuFynysUqMSeAVPBsSjyQ=;
h=Date:From:To:Cc:Subject:From;
b=Ot91u8+xZEFcqWqJa7UCNIL9yrkGxXKkBU7HrPkQcjr6b9yzqpwP8kEk/sl2y9Fmv
4mH4HEpFBzPNl4gm8i+0gEmY2cNd45awjgCi+UZEXl1JyUHQy5L3HbmgVggRqtUKsP
8x2SXzXE1d+DDW4UvhIZgIT4zuOpbAHi6TXvDQverWs76pdWIJbdwlqU0fuXWycxRL
eRgxGgwcEo9WSxSruQ2Mf2eoEDdtiU76z6CoBK3Me8vWaEeGCN704n18asYQwNaRQ0
twjbbRIq8vgzYsmZxqSvT5ljR7WyYLj7H8fT4dNQYKkS8EFm9fmyahFJLVs4rR1ej6
yQRUuQ5JhUXKg==
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 4SGB7X1qtdz4wcZ;
Thu, 26 Oct 2023 14:27:36 +1100 (AEDT)
Date: Thu, 26 Oct 2023 14:27:33 +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>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Michael Shavit <mshavit@google.com>,
Tina Zhang <tina.zhang@intel.com>,
Will Deacon <will@kernel.org>
Subject: linux-next: manual merge of the iommufd tree with the iommu tree
Message-ID: <20231026142733.442e18a5@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/tK7kIIiHSe7r3YfzFGS6Mxb";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no
version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email
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 (agentk.vger.email [0.0.0.0]);
Wed, 25 Oct 2023 20:27:58 -0700 (PDT)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1780787058517992389
X-GMAIL-MSGID: 1780787058517992389
|
| Series |
linux-next: manual merge of the iommufd tree with the iommu tree
|
|
Commit Message
Stephen Rothwell
Oct. 26, 2023, 3:27 a.m. UTC
Hi all,
Today's linux-next merge of the iommufd tree got a conflict in:
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c
between commit:
24503148c545 ("iommu/arm-smmu-v3: Refactor write_ctx_desc")
from the iommu tree and commit:
a247f322787d ("iommu: Add mm_get_enqcmd_pasid() helper function")
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/arm/arm-smmu-v3/arm-smmu-v3-sva.c index 353248ab18e7,08fac84c1804..000000000000 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c