On Fri, Aug 23, 2019 at 12:22:27PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the rdma tree got a conflict in:
>
> drivers/infiniband/hw/mlx5/mlx5_ib.h
>
> between commit:
>
> 0e6613b41edd ("IB/mlx5: Consolidate use_umr checks into single function")
>
> from the rdma-fixes tree and commit:
>
> 3e1f000ff746 ("IB/mlx5: Support per device q counters in switchdev mode")
>
> 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.
Looks OK to me, thanks
Jason
