lkml.org 
[lkml]   [2018]   [Jul]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRE: linux-next: manual merge of the net-next tree with the rdma tree
Date
Hi Stephen,

> -----Original Message-----
> From: linux-rdma-owner@vger.kernel.org <linux-rdma-owner@vger.kernel.org>
> On Behalf Of Stephen Rothwell
> Sent: Friday, July 27, 2018 12:09 AM
> To: Parav Pandit <parav@mellanox.com>
> Cc: Jason Gunthorpe <jgg@mellanox.com>; David Miller
> <davem@davemloft.net>; Networking <netdev@vger.kernel.org>; Doug
> Ledford <dledford@redhat.com>; Linux-Next Mailing List <linux-
> next@vger.kernel.org>; Linux Kernel Mailing List <linux-
> kernel@vger.kernel.org>; Ursula Braun <ubraun@linux.ibm.com>; Leon
> Romanovsky <leonro@mellanox.com>; linux-rdma@vger.kernel.org
> Subject: Re: linux-next: manual merge of the net-next tree with the rdma tree
>
> Hi Parav,
>
> On Fri, 27 Jul 2018 04:57:41 +0000 Parav Pandit <parav@mellanox.com> wrote:
> >
> > > for (i = 0; i < smcibdev->pattr[ibport - 1].gid_tbl_len; i++) {
> > > - memset(&_gid, 0, SMC_GID_SIZE);
> > > - memset(&gattr, 0, sizeof(gattr));
> > > - if (ib_query_gid(smcibdev->ibdev, ibport, i, &_gid, &gattr))
> > > + gattr = rdma_get_gid_attr(smcibdev->ibdev, ibport, i);
> > > + if (IS_ERR(gattr))
> > > continue;
> > > - if (!gattr.ndev)
> > > + if (!gattr->ndev)
> > > continue;
> > This requires a small fix.
> > If (!gattr->ndev {
> > rdma_put_gid_attr(gattr);
> > continue;
> > }
>
> Thanks, I have fixed this up for Monday.
You might want to consider this compatibility patch in Linux-rdma tree to avoid a merge conflict of smc.

https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git/commit/?h=for-next&id=7aaa1807e698f73094b78f0ef25b1a37a4409a55

\
 
 \ /
  Last update: 2018-07-31 23:12    [W:0.086 / U:0.092 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site