> -----Original Message----- > From: linux-rdma-owner@xxxxxxxxxxxxxxx [mailto:linux-rdma-owner@xxxxxxxxxxxxxxx] On Behalf Of Christoph Hellwig > Sent: Friday, August 07, 2015 10:13 AM > To: Steve Wise > Cc: 'Sagi Grimberg'; 'Doug Ledford'; linux-rdma@xxxxxxxxxxxxxxx; linux-nfs@xxxxxxxxxxxxxxx; target-devel@xxxxxxxxxxxxxxx > Subject: Re: [PATCH for-4.3 11/15] iw_cxgb4: Support ib_alloc_mr verb > > On Fri, Aug 07, 2015 at 10:06:26AM -0500, Steve Wise wrote: > > If it is too much of a pain to alter this patch, then I'll just > > submit the NFSRDMA fix and live with the bisect issue... > > Doug's tree is still to be rebased. So please submit your NFS > fix now as ask Doug to merge it before Sagi's series in the final > tree. My new NFS fix needs to land before these two: af78181 cxgb3: Support ib_alloc_mr verb b7e06cd iw_cxgb4: Support ib_alloc_mr verb But it will cause the following patch, which is after the above two, to need rework because it hits the same lines: e20684a xprtrdma, svcrdma: Convert to ib_alloc_mr I guess I'll post two patches, the NFS fix that preceeds af78181/ b7e06cd, and a reworked patch to replace e20684a. Is that the way to go in your opinion? Steve. -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html