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

[Jason Gunthorpe]

On Wed, Feb 01, 2023 at 12:14:02PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the iommu tree got a conflict in:
> 
>   drivers/infiniband/hw/usnic/usnic_uiom.c
> 
> between commit:
> 
>   b7e08a5a63a1 ("RDMA/usnic: use iommu_map_atomic() under spin_lock()")
> 
> from the rdma-fixes tree and commits:
> 
>   1369459b2e21 ("iommu: Add a gfp parameter to iommu_map()")
>   4dc6376af596 ("iommu: Remove iommu_map_atomic()")
> 
> from the iommu 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 good thank you

Jason