-----Original Message-----
From: Jason Gunthorpe <jgg@ziepe.ca>
Sent: Wednesday, August 1, 2018 12:14 PM
To: Stephen Rothwell <redacted>
Cc: Parav Pandit <redacted>; David Miller
[off-list ref]; Networking [off-list ref]; Doug
Ledford [off-list ref]; Linux-Next Mailing List <linux-
next@vger.kernel.org>; Linux Kernel Mailing List <linux-
kernel@vger.kernel.org>; Ursula Braun [off-list ref]; Leon
Romanovsky [off-list ref]; linux-rdma@vger.kernel.org
Subject: Re: linux-next: manual merge of the net-next tree with the rdma tree

On Wed, Aug 01, 2018 at 03:33:45PM +1000, Stephen Rothwell wrote:

quoted

Hi Parav,

On Tue, 31 Jul 2018 21:12:00 +0000 Parav Pandit [off-list ref]

wrote:

quoted

quoted

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

Ok, since commit that is now in the rdma tree, my resolution of the
original conflicts comes down to dropping all the changes to
net/smc/smc_core.c net/smc/smc_ib.c that come from the rdma tree and
adding

#include <rdma/ib_cache.h>

to net/smc/smc_ib.c.

Oh, that means I put the compat inline in the wrong header? Sigh.

It was in wrong place originally in ib_verbs.h because lately it returned all the entries from the cache.
So ib_cache.h was/is correct place.
But devel happened at pace where we eventually deprecated it.
So from pure compat perspective, yeah, it should be in wrong file i.e. ib_verbs.h but otherwise its correct in ib_cache.h.