From: Jason Gunthorpe <jgg@ziepe•ca>
To: linux-rdma@vger•kernel.org, Stephen Rothwell <sfr@canb•auug.org.au>
Cc: 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>,
Parav Pandit <parav@mellanox•com>,
Ursula Braun <ubraun@linux•ibm.com>,
Leon Romanovsky <leonro@mellanox•com>
Subject: Re: [PATCH rdma] IB/cache: Restore compatibility for ib_query_gid
Date: Sun, 29 Jul 2018 13:42:30 -0600 [thread overview]
Message-ID: <20180729194230.GB15106@ziepe.ca> (raw)
In-Reply-To: <20180727155402.GA15253@ziepe.ca>
On Fri, Jul 27, 2018 at 09:54:02AM -0600, Jason Gunthorpe wrote:
> Code changes in smc have become so complicated this cycle that the RDMA
> patches to remove ib_query_gid in smc create too complex merge conflicts.
> Allow those conflicts to be resolved by using the net/smc hunks by
> providing a compatibility wrapper. During the second phase of the merge
> window this wrapper will be deleted and smc updated to use the new API.
>
> Reported-by: Stephen Rothwell <sfr@canb•auug.org.au>
> Signed-off-by: Jason Gunthorpe <jgg@mellanox•com>
> include/rdma/ib_cache.h | 24 ++++++++++++++++++++++++
> 1 file changed, 24 insertions(+)
>
> The resolution Stephen had to make is too complicated, I think we
> should go this way instead. Parav can send a patch to DaveM during the
> 2nd half of the merge window to safely update SMC and delete this
> wrapper.
>
> Parav, can you check this?
>
> Ursula, this is only for SMC, are you able to test SMC with it? You
> will need to apply it to the RDMA tree here:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git/log/?h=for-next
>
> Thanks,
> Jason
I applied this to rdma for-next with Parav's notes.
Jason
prev parent reply other threads:[~2018-07-29 19:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-27 15:54 [PATCH rdma] IB/cache: Restore compatibility for ib_query_gid Jason Gunthorpe
2018-07-27 16:04 ` Parav Pandit
2018-07-27 16:09 ` Jason Gunthorpe
2018-07-27 16:11 ` Parav Pandit
2018-07-29 19:42 ` Jason Gunthorpe [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180729194230.GB15106@ziepe.ca \
--to=jgg@ziepe$(echo .)ca \
--cc=davem@davemloft$(echo .)net \
--cc=dledford@redhat$(echo .)com \
--cc=leonro@mellanox$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-rdma@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=parav@mellanox$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=ubraun@linux$(echo .)ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox