Re: linux-next: manual merge of the iommufd tree with the iommu tree

[Jason Gunthorpe]

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