On Thu, Oct 24, 2019 at 11:01:15AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the rdma tree got a conflict in:
>
> drivers/infiniband/hw/mlx5/odp.c
>
> between commit:
>
> 9dc775e7f550 ("RDMA/odp: Lift umem_mutex out of ib_umem_odp_unmap_dma_pages()")
>
> from Linus' tree and commit:
>
> a3de94e3d61e ("IB/mlx5: Introduce ODP diagnostic counters")
>
> from the rdma tree.
>
> I fixed it up (see below - but maybe the mlx5_update_odp_stats()
> also needs to move after the moved mutex_unlock()?)
nope, this resolution is right, thanks
Jason
