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;
Date:   Tue, 31 Oct 2023 08:31:54 -0300
From:   Jason Gunthorpe <jgg@nvidia.com>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Joerg Roedel <joro@8bytes.org>,
        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>,
        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: <20231031113154.GX3952@nvidia.com>
References: <20231027155522.6b2863a4@canb.auug.org.au>
 <20231027171522.692a58ec@canb.auug.org.au>
 <20231030182621.GV3952@nvidia.com>
 <20231031161214.25560598@canb.auug.org.au>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20231031161214.25560598@canb.auug.org.au>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?HbNbJemcS8DhGZ0cXScwkGJEp7wx9l7Olbm3P4XNUKz5RDzwD99xyvPdgOoG?=
 =?us-ascii?Q?Eo5io+WydlsX0YxKmDR3ZzS9XEyYx86EHpkpNsCyROmd3cpp/QH+4W3I0gjp?=
 =?us-ascii?Q?unqq7y6be8Ybkr2FoPbuDl7edZO1iAiw+QVVKzlXY29RkppiXWhhfWBpHwtw?=
 =?us-ascii?Q?Oakeq3n7YhY3HvHodF/10YCrwosd/k7eyxiFrtCExNLK/YGlXcLPJtJmqW/7?=
 =?us-ascii?Q?hpkCcmWrLsfvUDJVACf+60e/I4kRw+304jvF9IvX220sc3pbg/ej9kK4WS+H?=
 =?us-ascii?Q?QCpF56s49pyUoxHOyPqiSUBZXXamSbQ0c6YaU3IcdyCP3jfS17NdxJ2VEEUD?=
 =?us-ascii?Q?Qk/yjZzKuQ9JD2ofjYovzpEsB8zLH8kLDvQ242/ADdzva7mZcvVqnbHT8tD2?=
 =?us-ascii?Q?zOGN1X5S2APJSXiSivLgpI02nlz99OcnrvvUQ/cJqwA0u/hlUo2CejV85Ohv?=
 =?us-ascii?Q?X8MV7en7vU86Wj2W4hnkTC32FAnqDNbn4s+O5lr4UXFbAHmfoVM+TZKs454l?=
 =?us-ascii?Q?Jik5Czqa5pRfwMT4Av3bU7pCYgsrDAA05es7Vsje8Yllt0BJ4e9C0ByIGSxQ?=
 =?us-ascii?Q?Xez2prFSgtQ8Ro0gAl/I0HaxVmnacfw3vxcvmzNE+k5SevCotPnKsEjqVepQ?=
 =?us-ascii?Q?AF5yQ8aksZh1Ff0uvQEgQecAnxWpRqCehi/zI9eRNwjj2Prk2ZSJUsH4ySq5?=
 =?us-ascii?Q?YiRQa1hrTJLbeCxvHJ7Bx/2Fe69TRP4JmfJSSVoS4Fr5ucOAbPTyskKl/F7m?=
 =?us-ascii?Q?sDg+9+bnd/I4chZWRZSdEzleGkUpDUJXw7jHeTz5W+m3PAaLXJ58gCl6/IUr?=
 =?us-ascii?Q?Nq1X1kDjzb+VfjZLdtMudtJDhNjag8UR3rd6ks/x4ueHlDo5NXuyuUOzBj3G?=
 =?us-ascii?Q?G//b45kqQxNbEKMeoBJIiFEAV3yoVMlzxoeFB1u44LqDVGiJgOR020r0gBvA?=
 =?us-ascii?Q?JlARO/ZkThJDdA/TTvDSnsbho+n3dLbSJEffVmfP1wFPJqlhWeF/q1nEI+Ek?=
 =?us-ascii?Q?2vE6QiZ2g0hXbq4/tOvLIam8meoDIjiLxZuRQRAfe1uAZRdeznl12a+AUkkw?=
 =?us-ascii?Q?rux5iPZp7wNbkaF0yXg1Jc+L5fM6QvMsx21T13y4IPt+0ovn6t56LBvjjcbJ?=
 =?us-ascii?Q?UyYyu3M8ZErWSxNr6OTq6NUDAG3eUUoQtQGZc00URIzGnclqI7u4d9J2m2Zm?=
 =?us-ascii?Q?uAM4+UoehvEuDF70dLRBJj9F6QZHU8gWUOantIAmzqWjDZhKZYaB14M1mRe3?=
 =?us-ascii?Q?twDrnGHwj2lm3kdCdSZx+Q611zz3jPsP9JadDUqRkFyHBJqs9rCs4D58Zcd0?=
 =?us-ascii?Q?2cmMmbCs3aIJQwJILVgeVaymHyOsrXq+o0+wneAZKinR19m1wezaEOnRZGXu?=
 =?us-ascii?Q?cKiKios+W+MR/5ahd3Ds2cKk2H+V2sAYGsenGu023wWzMMDiMMwtt6QL2z/B?=
 =?us-ascii?Q?y8tS5ZrZWdkAyXhhniFzOUZEc5IP3pAl5CXOPjdmEXyp/UB5x4HV/Jhnf/FL?=
 =?us-ascii?Q?mCgZMawVgHpv7ofKgL7kWks0QB8+eltfNvZy1ZQYRcbX8w7XB5Q8v0eiBA51?=
 =?us-ascii?Q?QlH9qnNRAMaXf13Plyc=3D?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 3a4592b7-48f2-466b-a3f8-08dbda04fc38
X-MS-Exchange-CrossTenant-AuthSource: LV2PR12MB5869.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Oct 2023 11:31:55.0416
 (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: XjtadhLhSaUttrBLpNPQW8f2+Mj8Zpx9IiJahdqtAjOidz1/fo4ssnzGs6e4F8pR
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6628
X-Spam-Status: No, score=-1.3 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE
	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]); Tue, 31 Oct 2023 04:32:14 -0700 (PDT)

On Tue, Oct 31, 2023 at 04:12:14PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> On Mon, 30 Oct 2023 15:26:21 -0300 Jason Gunthorpe <jgg@nvidia.com> wrote:
> >
> > On Fri, Oct 27, 2023 at 05:15:22PM +1100, Stephen Rothwell wrote:
> > > 
> > > On Fri, 27 Oct 2023 15:55:22 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:  
> > > >
> > > > Today's linux-next merge of the iommufd tree got a conflict in:
> > > > 
> > > >   drivers/iommu/iommufd/selftest.c
> > > > 
> > > > between commits:
> > > > 
> > > >   1c68cbc64fe6 ("iommu: Add IOMMU_DOMAIN_PLATFORM")
> > > >   13fbceb1b8e9 ("iommufd: Convert to alloc_domain_paging()")
> > > > 
> > > > from the iommu tree and commits:
> > > > 
> > > >   408663619fcf ("iommufd/selftest: Add domain_alloc_user() support in iommu mock")
> > > >   266ce58989ba ("iommufd/selftest: Test IOMMU_HWPT_ALLOC_DIRTY_TRACKING")
> > > >   7adf267d66d1 ("iommufd/selftest: Test IOMMU_HWPT_SET_DIRTY_TRACKING")
> > > >   a9af47e382a4 ("iommufd/selftest: Test IOMMU_HWPT_GET_DIRTY_BITMAP")
> > > >   0795b305da89 ("iommufd/selftest: Test IOMMU_HWPT_GET_DIRTY_BITMAP_NO_CLEAR flag")
> > > >   65fe32f7a447 ("iommufd/selftest: Add nested domain allocation for mock domain")
> > > > 
> > > > 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.  
> > > 
> > > The resolution should have been as below (I think).  
> > 
> > This was too horrible, I pushed a patch to reorganize the new iommufd side
> > code to more closely match how the domain_alloc_paging stuff is
> > supposed to work
> 
> I have used the conflict resolution below now.

Yep!

Thanks,
Jason