On Mon, Jan 15, 2018 at 11:53:21AM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the rdma tree got a conflict in: > > drivers/infiniband/hw/mlx5/main.c > > between commits: > > 8978cc921fc7 ("{net,ib}/mlx5: Don't disable local loopback multicast traffic when needed") > 72f36be06138 ("net/mlx5: Fix mlx5_get_uars_page to return error code") > > from the net tree and commits: > > 16c1975f1032 ("IB/mlx5: Create profile infrastructure to add and remove stages") > c8b8992446a9 ("IB/mlx5: Move loopback initialization to the corresponding stage") > > 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 > Thanks, Stephen. It looks right to me.
Attachment:
signature.asc
Description: PGP signature