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

Jens Axboe
2018-07-26T17:48:43Z

On 7/26/18 1:48 AM, Christoph Hellwig wrote:
> On Thu, Jul 26, 2018 at 02:56:24PM +1000, Stephen Rothwell wrote:
>> diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c
>> index 86121a7a19b2..8c30ac7d8078 100644
>> --- a/drivers/nvme/target/rdma.c
>> +++ b/drivers/nvme/target/rdma.c
>> @@ -891,7 +891,7 @@ nvmet_rdma_find_get_device(struct rdma_cm_id *cm_id)
>>
>> 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?

--
Jens Axboe