Re: linux-next: manual merge of the rdma tree with Linus' tree

[Leon Romanovsky]

On Thu, Mar 20, 2025, at 03:08, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the rdma tree got a conflict in:
>
>   drivers/infiniband/hw/mlx5/mr.c
>
> between commit:
>
>   cc668a11e6ac ("RDMA/mlx5: Fix a race for DMABUF MR which can lead to 
> CQE with error")
>
> from Linus' tree and commit:
>
>   24d693cf6c89 ("RDMA/mlx5: Fix cache entry update on dereg error")
>
> from the rdma 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.
>
> -- 
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/infiniband/hw/mlx5/mr.c
> index 753faa9ad06a,2080458cabd1..000000000000
> --- a/drivers/infiniband/hw/mlx5/mr.c
> +++ b/drivers/infiniband/hw/mlx5/mr.c
> @@@ -2023,8 -2031,7 +2032,9 @@@ static int mlx5_revoke_mr(struct mlx5_i
>   	struct mlx5_ib_dev *dev = to_mdev(mr->ibmr.device);
>   	struct mlx5_cache_ent *ent = mr->mmkey.cache_ent;
>   	bool is_odp = is_odp_mr(mr);
>  +	bool is_odp_dma_buf = is_dmabuf_mr(mr) &&
>  +			!to_ib_umem_dmabuf(mr->umem)->pinned;
> + 	bool from_cache = !!ent;
>   	int ret = 0;

LGTM, Thanks a lot.

>  
>   	if (is_odp)