Subject: Re: linux-next: build failure after merge of the block tree

From: Christoph Hellwig <[email-masked]>
Date: Thu, 26 Jul 2018 19:56:43 +0200

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.