> -----Original Message----- > From: Christoph Hellwig <hch@xxxxxx> > Sent: Thursday, July 26, 2018 12:57 PM > To: Jens Axboe <axboe@xxxxxxxxx> > Cc: Christoph Hellwig <hch@xxxxxx>; Stephen Rothwell > <sfr@xxxxxxxxxxxxxxxx>; Doug Ledford <dledford@xxxxxxxxxx>; Jason > Gunthorpe <jgg@xxxxxxxxxxxx>; Linux-Next Mailing List <linux- > next@xxxxxxxxxxxxxxx>; Linux Kernel Mailing List <linux- > kernel@xxxxxxxxxxxxxxx>; Steve Wise <swise@xxxxxxxxxxxxxxxxxxxxx> > Subject: Re: linux-next: build failure after merge of the block tree > > On Thu, Jul 26, 2018 at 10:48:21AM -0700, Jens Axboe wrote: > > >> inline_page_count = num_pages(port->inline_data_size); > > >> inline_sge_count = max(cm_id->device->attrs.max_sge_rd, > > >> - cm_id->device->attrs.max_sge) - 1; > > >> + cm_id->device->attrs.max_send_sge) - 1; > > > > > > This should be max_recv_sge. > > > > Why do we even have this conflicts to begin with? > > Because the nvme code added a new user of max_sges while the RDMA tree > split it into two separate fields. We discussed this a while ago when > the issue came up. See: https://www.spinics.net/lists/linux-rdma/msg66208.html Steve. -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html