On 6/20/2018 3:24 AM, Christoph Hellwig wrote: > On Tue, Jun 19, 2018 at 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. Ok, I'll remove the dependency in the next version. Thanks, Steve. -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html