Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp763634imm; Thu, 26 Jul 2018 11:33:26 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeJ0GMKLSfEGW0xmlNn1TiEYRK/elcTc2autSTI0+Lsw0d9hChS8C32IUl4uBjUYpKWrWQg X-Received: by 2002:a17:902:7488:: with SMTP id h8-v6mr2985958pll.41.1532630006526; Thu, 26 Jul 2018 11:33:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532630006; cv=none; d=google.com; s=arc-20160816; b=qmFJOlBaqg4RVWVoSnB6qCVxnPbdMKEkISpo6v3sVRB7gHQ8wA8ykkbGHDxCBIP0Un 1Z4UlzD67M9eTIXucTdvB7ExXBTP0BQn9mm9iG3hxrMeTYh07t0PQNHNNO1yqxsBBMqx 7+ubdWytEU4Xf5tpURbjVVcL+XwBgJpwwEeNx/ICEytoHsyrHV3zP4bRwJXEN+EN1MKN F0Uix1CDXxKKz1IqXOuWs7bEb5JKqdxCoja3kzg3KpqWBG9F1X+Xjy0nQzz7rQMOb/yp QcMj3I/JJG/OB4kx4cSBC+3o1yuznc3izIPTQWlkcKlYGz3pm2s4UeOo0DdJjw7NP/aE ChFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:thread-index:content-language :content-transfer-encoding:mime-version:message-id:date:subject :in-reply-to:references:cc:to:from:arc-authentication-results; bh=9dCIOx/VJ0mXn3A/R7nxjNY3wRf7IFnvPTTbxYqKZII=; b=Oh75UVMVitned/uM0yEstbgUBSa8+bc8I3AZLiLgPdy8jCOI1OHjzXKQMDmGX5e4A8 N4+ojx0tiWyZOLEpuxLh5/A/cPvoQZAtjjmioFGJiGTQ5wg/OwiscCGBbpZA3PdRQ38V 2dFt2E722auAf9wdHNnCLJIoV25sqW10TdlSWs2qX4yBlAqd8yVlQlpW8SV73/1mQeR2 4saOh0l+JI9+OJpPtZjDN6k/jkCWNu4xZbmxZmyhUN0BqsnoAkbakaFuuCeU2I/R1LIv jr/e4F6bwTwtOw890W7ALiNQPxpDJ30cz5JVoeNs4I9VykyJQqhADKja8iyUyuSmQCoh jFMA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 5-v6si1674181plx.517.2018.07.26.11.33.11; Thu, 26 Jul 2018 11:33:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388943AbeGZTR2 (ORCPT + 99 others); Thu, 26 Jul 2018 15:17:28 -0400 Received: from linode.aoot.com ([69.164.194.13]:35946 "EHLO linode.aoot.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388871AbeGZTR2 (ORCPT ); Thu, 26 Jul 2018 15:17:28 -0400 Received: from stevoacer (47-221-137-213.gtwncmta03.res.dyn.suddenlink.net [47.221.137.213]) by linode.aoot.com (Postfix) with ESMTP id A9B84821C; Thu, 26 Jul 2018 12:59:33 -0500 (CDT) From: "Steve Wise" To: "'Christoph Hellwig'" , "'Jens Axboe'" Cc: "'Stephen Rothwell'" , "'Doug Ledford'" , "'Jason Gunthorpe'" , "'Linux-Next Mailing List'" , "'Linux Kernel Mailing List'" References: <20180726145624.13a604ed@canb.auug.org.au> <20180726084833.GA23310@lst.de> <20180726175643.GA10765@lst.de> In-Reply-To: <20180726175643.GA10765@lst.de> Subject: RE: linux-next: build failure after merge of the block tree Date: Thu, 26 Jul 2018 12:59:35 -0500 Message-ID: <00b801d4250a$69e2a9f0$3da7fdd0$@opengridcomputing.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Mailer: Microsoft Outlook 16.0 Content-Language: en-us Thread-Index: AQKoseR149ZceM129HjmJJMloZXPqgF4nzvXANjmRz0DTY8a/6LLuFYA Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > -----Original Message----- > From: Christoph Hellwig > Sent: Thursday, July 26, 2018 12:57 PM > To: Jens Axboe > Cc: Christoph Hellwig ; Stephen Rothwell > ; Doug Ledford ; Jason > Gunthorpe ; Linux-Next Mailing List next@vger.kernel.org>; Linux Kernel Mailing List kernel@vger.kernel.org>; Steve Wise > 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.