[PATCH v4 0/3] NVMF/RDMA 16K Inline Support

[jgg@mellanox.com (Jason Gunthorpe)]

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