From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id D764B7CB6 for ; Mon, 25 Sep 2017 12:07:00 +0200 (CEST) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Sep 2017 03:06:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.42,435,1500966000"; d="scan'208";a="903557781" Received: from fyigit-mobl1.ger.corp.intel.com (HELO [10.237.220.57]) ([10.237.220.57]) by FMSMGA003.fm.intel.com with ESMTP; 25 Sep 2017 03:06:58 -0700 From: Ferruh Yigit To: Bruce Richardson , Thomas Monjalon Cc: Andrew Rybchenko , dev@dpdk.org, Chas Williams References: <1506322206-30233-1-git-send-email-arybchenko@solarflare.com> <535fdb9a-f892-afcd-77e5-4f87e68e2024@intel.com> <20170925094053.GA14012@bricha3-MOBL3.ger.corp.intel.com> <510427f2-5761-024f-791a-7d44c58231c9@intel.com> Message-ID: Date: Mon, 25 Sep 2017 11:06:57 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <510427f2-5761-024f-791a-7d44c58231c9@intel.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-dev] [PATCH] net/af_packet: fix build failure because of unused parameter X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Sep 2017 10:07:01 -0000 On 9/25/2017 10:53 AM, Ferruh Yigit wrote: > On 9/25/2017 10:40 AM, Bruce Richardson wrote: >> On Mon, Sep 25, 2017 at 09:42:56AM +0100, Ferruh Yigit wrote: >>> On 9/25/2017 7:50 AM, Andrew Rybchenko wrote: >>>> Failure happens on build using: >>>> gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-4) >>> >>> Yes, that case is missed. What do you think about following one: >>> >>> @@ -561,7 +561,7 @@ rte_pmd_init_internals(struct rte_vdev_device *dev, >>> unsigned int blockcnt, >>> unsigned int framesize, >>> unsigned int framecnt, >>> - unsigned int qdisc_bypass, >>> + unsigned int qdisc_bypass __rte_unused, >>> struct pmd_internals **internals, >>> struct rte_eth_dev **eth_dev, >>> struct rte_kvargs *kvlist) >>> >>>> >>>> Fixes: 0d16c17ae7a4 ("net/af_packet: make qdisc bypass configurable") >>>> >>>> Signed-off-by: Andrew Rybchenko >>>> --- >>>> May be the right solution in fact remove PACKET_QDISC_BYPASS conditional >>>> completely. If below solution is accepted, feel free to squash it into >>>> the original patch. >>> >>> It is a little to late for this, I already sent a pull-request with this >>> patch. So fix will need to be a separate patch. >>> >> Pull request hasn't actually been pulled yet, so you should be able to >> supercede it by a later one, right? > > Technically yes, and easy to do, but it will be confusing. I was taking > pull-request as code freeze in sub-tree. > > If there are multiple pull-request for a tree, how can one be sure which > ones has been pulled and what to expect in main repo, and verify what > has been merged? > > As above said, if Thomas thinks this is OK, I can send another pull request? What about Thomas doing the squash while applying to the main repo, so that main repo won't be broken and there won't be multiple pull requests around?