netdev - RE: linux-next: manual merge of the net-next tree with the rdma tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <VI1PR0502MB3008076016496152D4898D8ED12E0@VI1PR0502MB3008.eurprd05.prod.outlook.com>
Date:   Tue, 31 Jul 2018 21:12:00 +0000
From:   Parav Pandit <parav@...lanox.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
CC:     Jason Gunthorpe <jgg@...lanox.com>,
        David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>,
        Doug Ledford <dledford@...hat.com>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Ursula Braun <ubraun@...ux.ibm.com>,
        Leon Romanovsky <leonro@...lanox.com>,
        "linux-rdma@...r.kernel.org" <linux-rdma@...r.kernel.org>
Subject: RE: linux-next: manual merge of the net-next tree with the rdma tree

Hi Stephen,

> -----Original Message-----
> From: linux-rdma-owner@...r.kernel.org <linux-rdma-owner@...r.kernel.org>
> On Behalf Of Stephen Rothwell
> Sent: Friday, July 27, 2018 12:09 AM
> To: Parav Pandit <parav@...lanox.com>
> Cc: Jason Gunthorpe <jgg@...lanox.com>; David Miller
> <davem@...emloft.net>; Networking <netdev@...r.kernel.org>; Doug
> Ledford <dledford@...hat.com>; Linux-Next Mailing List <linux-
> next@...r.kernel.org>; Linux Kernel Mailing List <linux-
> kernel@...r.kernel.org>; Ursula Braun <ubraun@...ux.ibm.com>; Leon
> Romanovsky <leonro@...lanox.com>; linux-rdma@...r.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@...lanox.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