All of lore.kernel.org
 help / color / mirror / Atom feed
From: jgg@mellanox.com (Jason Gunthorpe)
Subject: [PATCH v4 0/3] NVMF/RDMA 16K Inline Support
Date: Wed, 20 Jun 2018 12:03:52 -0600	[thread overview]
Message-ID: <20180620180352.GF27457@mellanox.com> (raw)
In-Reply-To: <20180620082444.GB3033@lst.de>

On Wed, Jun 20, 2018@10:24:44AM +0200, Christoph Hellwig wrote:
> On Tue, Jun 19, 2018@11:43:13AM -0600, Jason Gunthorpe wrote:
> > > +doug and jason.
> > > 
> > > There is one merge issue: This series will require the max_send/recv_sge
> > > commit, which is merged in rdma-next [1] just recently. Perhaps you can
> > > pull that from the linux-rdma repo if and when these 2 nvme patches are
> > > pulled into your repo? I think that will allow easy merging when the
> > > block and rdma repos get merged into Linus' repo.
> > 
> > Pulling the rdma tree into nvme is probably not something anyone would
> > want to do..
> > 
> > Can we take these patches through rdma instead?
> 
> There are chances for various conflicts as well.  I think the best
> is to just apply the patches without using the new split fields to
> the nvme tree and then carry the fixup to max_send_sge/max_recv_sge
> in linux-next.

Okay, Steve, however you do this, please make sure your NVMe patch
creates a merge conflict with linux-rdma so it does get carried up to
Linus as a conflict.

Thanks,
Jason

      parent reply	other threads:[~2018-06-20 18:03 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-05 17:22 [PATCH v4 0/3] NVMF/RDMA 16K Inline Support Steve Wise
2018-06-05 17:16 ` [PATCH v4 1/3] nvme-rdma: correctly check for target keyed sgl support Steve Wise
2018-06-06 12:31   ` Christoph Hellwig
2018-06-05 17:16 ` [PATCH v4 2/3] nvme-rdma: support up to 4 segments of inline data Steve Wise
2018-06-05 17:16 ` [PATCH v4 3/3] nvmet-rdma: support max(16KB, PAGE_SIZE) " Steve Wise
2018-06-06  9:24   ` Sagi Grimberg
2018-06-07 19:53     ` Steve Wise
2018-06-19 11:59   ` Sagi Grimberg
2018-06-19 14:35     ` Steve Wise
2018-06-19 19:29       ` Steve Wise
2018-06-18 14:49 ` [PATCH v4 0/3] NVMF/RDMA 16K Inline Support Steve Wise
2018-06-18 15:18   ` Steve Wise
2018-06-19  5:40     ` Christoph Hellwig
2018-06-19  9:21       ` Max Gurtovoy
2018-06-19 14:41         ` Steve Wise
2018-06-19 16:02       ` Steve Wise
2018-06-19 17:43         ` Jason Gunthorpe
2018-06-20  8:24           ` Christoph Hellwig
2018-06-20 14:02             ` Steve Wise
2018-06-20 18:03             ` 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=20180620180352.GF27457@mellanox.com \
    --to=jgg@mellanox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.