Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1;
Date:   Wed, 11 Oct 2023 10:58:32 -0300
From:   Jason Gunthorpe <jgg@nvidia.com>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Joerg Roedel <joro@8bytes.org>, 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>,
        Nicolin Chen <nicolinc@nvidia.com>, Yi Liu <yi.l.liu@intel.com>
Subject: Re: linux-next: manual merge of the iommufd tree with the iommu tree
Message-ID: <20231011135832.GX3952@nvidia.com>
References: <20231011160357.292c84e3@canb.auug.org.au>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20231011160357.292c84e3@canb.auug.org.au>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?fD1MT1Jmq7MYmJWXSNEIRDkKynFnrpZyw+fpiK/wW7f1pebgWl1U2pVnXO6U?=
 =?us-ascii?Q?UzApjKBNpDqwj3PXBj5RiZRBrn+ymh0B9Im/ASSEtkcazJBznlDrkTytM2sP?=
 =?us-ascii?Q?Jg819aYTiYw9hl1DiImG7cltAJSWzpEcf+QLCwKZDNxxVlZBOpL36AIMl46Y?=
 =?us-ascii?Q?k6jrZCx9R2xv5C5ey6K5Zz2I/QcNkEcvD33N8rZmYlNJ6d8Gbgs/CtNiJDbQ?=
 =?us-ascii?Q?7848PmB9uqa/1+eYGbkUj2silKlQt9FFA3mN6EQUTWqNRUpzIe+Pfb+LS0hT?=
 =?us-ascii?Q?aHZUJ9gkGyeeQeYWqoCe9RT3T5ad2SsscBo2ssg95sTlC0sz1XIMJ8mTyno9?=
 =?us-ascii?Q?W2KLIxTepJ2HmzykppspjrQK10/dpaI5D/neFlMQoab3hPjCqF/dyn3jHHVN?=
 =?us-ascii?Q?t7eKnqqwrf9by+noLG0Y0ZbL7udKKip+7lTampAdfTOVE2xVdVrCNrtc/BWS?=
 =?us-ascii?Q?LNiNPnG0vhebTfA/lhmBbOLLwCbhA7TCXjmadOsDRvkmutdkAOcfYocbbtx5?=
 =?us-ascii?Q?baBydXNQKYbKCmYYL30x58S+26eFo6W6mH4lD9BCTqNxmxHkX+hRzJXAnKfP?=
 =?us-ascii?Q?q393Ku+6r2MNcxksCCa4qGqkONwTIxWPi2iHNZkxsBCLcRphSx9/oxt0DS92?=
 =?us-ascii?Q?f+TqH02XHT1XSBR+r3M9c+uNrn85hpxfk/+YSiR1YGOXzWMimC6DmqtOBCD7?=
 =?us-ascii?Q?n5tTtKWZDPiej6/76xz+lZW3HROMybiDOo4Kr6fiTjyva8m7u6z+4aWGspFK?=
 =?us-ascii?Q?hukcOk5kq1eq+XWJ+2Ma7wd8+L9dSPNFVt8f7OiZ45dtHKIEd0pslnKhu/Jq?=
 =?us-ascii?Q?10l1P4bUGUaTuWSeKIkMbzoCkHeHzAn48P76CbBWSxoG7kl7rEXdj3UdD0/s?=
 =?us-ascii?Q?JcNe+DDpiHi+4ufAAmLA/YzmhkHy21r8ovR5kFOwKcA4h5anRndtZyXGKMpN?=
 =?us-ascii?Q?tOloNhFajt9oWgm5ddGvLImeVsdFlnVU5+Xk5lhVr790MYHkFIm1LZLVqH3s?=
 =?us-ascii?Q?8S32k5TEyL/cgjSQz8BKAylUL3wrhDTHkEUNfm8Aax1bzqzZ7ycmsdCLf43i?=
 =?us-ascii?Q?TYuZvMg3L+1MxeGU8QGAsRVxXzqoWC7HwK0z/NLIBxQWtXSF9aQ3HZMjq8Qw?=
 =?us-ascii?Q?7CfpuYdWWcQVeRQuVDWdyjLWHFykqMxfZnp5WBhlCvTYL/ki6SFUVBklolyB?=
 =?us-ascii?Q?/Pk/IX7XEmC2diwiqhszB6fWsMiY5eh0hwp4XlGj6BTLcJpCymBnboTU9Dhr?=
 =?us-ascii?Q?bgQ8n9ygY11XkDD0+f2eyoHMKmIDwyWvTGQInPFw2510DBlnqWdkq/VYp9fh?=
 =?us-ascii?Q?vn2nFtZDSSUwnUFwgs24Ry7RQvWyUsZyBpzn4FywKpEc50KW6Zd0N7r+mEKv?=
 =?us-ascii?Q?eD1vYz4lTsmiiKv4jcpk8u+Nre0pmWiHQuXy/ghtYUsoeFUkhaCJb9iNrZ2J?=
 =?us-ascii?Q?4j/+p56Wll0FV9LhNEOqxfgdeW8kN3345Kt3DssjjciksjGha2PRjJoH9qww?=
 =?us-ascii?Q?U0K5OaxwlmJFni7St+y9ry3bPdyMpWdzja6fbGUECytK6HePmMYx25YTu1e4?=
 =?us-ascii?Q?mgKfZp6rRmvq7UYdD6H9hHlCtTsPnHEJs6HMF4/Q?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 214f2992-5325-4b70-f79d-08dbca622c0d
X-MS-Exchange-CrossTenant-AuthSource: LV2PR12MB5869.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2023 13:58:39.9093
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 0lyhEMSfCo0j4q+0/ikwCjkXvS7GWt4m7ACCbClRLz3IWqHqUYDzPCuJtjwr0889
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8294
X-Spam-Status: No, score=2.7 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.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 (morse.vger.email [0.0.0.0]); Wed, 11 Oct 2023 06:59:13 -0700 (PDT)
X-Spam-Level: **

On Wed, Oct 11, 2023 at 04:03:57PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the iommufd tree got a conflict in:
> 
>   include/linux/iommu.h
> 
> between commit:
> 
>   4601cd2d7c4c ("iommu: Add ops->domain_alloc_paging()")
> 
> from the iommu tree and commit:
> 
>   909f4abd1097 ("iommu: Add new iommu op to create domains owned by userspace")
> 
> 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.

Looks right, thanks

Jason