On Wed, Jan 17, 2018 at 12:55:37PM +1100, Stephen Rothwell wrote: > Hi all, > > On Wed, 17 Jan 2018 12:51:45 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > > > > diff --cc drivers/infiniband/hw/mlx5/qp.c > > index cffe5966aef9,ae36db3d0deb..000000000000 > > +++ b/drivers/infiniband/hw/mlx5/qp.c > > @@@ -4361,12 -4674,12 +4674,11 @@@ static void to_rdma_ah_attr(struct mlx5 > > > > memset(ah_attr, 0, sizeof(*ah_attr)); > > > > - if (!path->port || path->port > MLX5_CAP_GEN(dev, num_ports)) > > - ah_attr->type = rdma_ah_find_type(&ibdev->ib_dev, path->port); > > - rdma_ah_set_port_num(ah_attr, path->port); > > - if (rdma_ah_get_port_num(ah_attr) == 0 || > > - rdma_ah_get_port_num(ah_attr) > ibdev->num_ports) > > ++ if (!path->port || path->port > ibdev->num_ports)) > > I fixed up the extra ')'. Sorry about that, Thanks, this looks correct to me, and the conflict was expected.. Jason -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
