lkml.org 
[lkml]   [2018]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the rdma tree with the rdma-fixes tree
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@canb.auug.org.au> 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

\
 
 \ /
  Last update: 2018-01-18 00:19    [W:0.069 / U:0.164 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site