From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg0-f45.google.com (mail-pg0-f45.google.com [74.125.83.45]) by dpdk.org (Postfix) with ESMTP id B96B07D5E for ; Mon, 21 Aug 2017 11:23:34 +0200 (CEST) Received: by mail-pg0-f45.google.com with SMTP id m133so14547637pga.5 for ; Mon, 21 Aug 2017 02:23:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux-org.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=NdLS2weuY3ByIko7HEoJ+aVhvD0bMOqR/xuhrjySvLw=; b=B/Pc7A67616ki7MjuktJfVbyh8ukJJ373E4F2iIBeqJT2bWh+3OHVjlDccftqnKh98 ZeQcjcFH8jwCv72QUvKzk7SoS0RV6RfzqsxbievRtZGzL2QNhhZW1n5oCIucRxFtqmu8 48zfY8almEQyibWNv2OphAC1bwoQJGOPy+JBdW2qUceRp5PaeY3dN69kNNB3KK9d7437 Gala1QCizFc0OLC7ytccEXBj8dxkY/NFhtz3McCkkCsNJQSLEloagnaJTomGDmGTakfa i1kAVpDp/md0Xh4R5dFzvGpT3g4Aw777648XZfBbRjKWJuLpKnZH9XCom+FXmnm35IM/ Wzhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=NdLS2weuY3ByIko7HEoJ+aVhvD0bMOqR/xuhrjySvLw=; b=ns8N1yv5etlrYaG0EOJBE0qLYBHzWvFxdyXlFStKO/0alDKMs7zgtveaXPv0ZG9yCP vV2r9H6DPKhbsjjCdbwBgR4y1dbe4aRxJ7p1xA7E212nxyIbYBp5IQTVkZNNEGH0mIXI wJQvz4ZuKGS26qXdODf7f/y7kw/p0YLVSNy4nQsKMxt5YxPMrMu8v2v/4ejixU5yN3/m KiGEQLhg+m6epX9ckM1jrfnj8JgPAKD5iayrskyXZuy4KQ46THc95gT2qKj1pH3DSsjX 8w6qB2GIu2qQSBT0TsTeDlzLWn/MfMozZWcQh8QSzMW4ry/msnmqTJ/GmynbGEil1OIp yJ8A== X-Gm-Message-State: AHYfb5gA4/EKSyyfV66DyhrMibHUIfrpnhr6UGDy9f7WhJ9E9kBQTxD1 S/t3zM4PzcNiXMIa X-Received: by 10.99.112.30 with SMTP id l30mr12826021pgc.117.1503307413747; Mon, 21 Aug 2017 02:23:33 -0700 (PDT) Received: from yliu-home ([45.63.61.64]) by smtp.gmail.com with ESMTPSA id h192sm18716389pgc.20.2017.08.21.02.23.31 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 21 Aug 2017 02:23:32 -0700 (PDT) Date: Mon, 21 Aug 2017 17:23:26 +0800 From: Yuanhan Liu To: Ferruh Yigit Cc: Kevin Traynor , dpdk stable , dev@dpdk.org Message-ID: <20170821092326.GQ9612@yliu-home> References: <20170818104545.GN9612@yliu-home> <20170821034011.GO9612@yliu-home> <2d8dbb48-978f-94fb-1282-8b5c4ea30220@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <2d8dbb48-978f-94fb-1282-8b5c4ea30220@intel.com> User-Agent: Mutt/1.5.24 (2015-08-30) Subject: Re: [dpdk-stable] 16.11.3 (LTS) patches review and test X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Aug 2017 09:23:35 -0000 On Mon, Aug 21, 2017 at 09:23:24AM +0100, Ferruh Yigit wrote: > >> I think this one should go in too, as OVS hits this and writes back the > >> wrong watermark value to the shared register which can cause problems > >> for other ports. I've applied and tested it with DPDK 16.11. > >> > >> commit 0e61ab56e01655f02bfe4e6249e032e864b0f5dd > >> Author: Qi Zhang > >> Date: Thu Aug 10 18:48:07 2017 +0800 > >> > >> net/i40e: fix flow control watermark mismatch > >> > >> Flow control watermark is not read out correctly, > >> that may cause an application who not intend to change > >> watermark but does change it with a rte_eth_dev_flow_ctrl_set > >> call right after rte_eth_dev_flow_ctrl_get. > > > > Weird, I couldn't find this commit: > > > > $ git show 0e61ab56e01655f02bfe4e6249e032e864b0f5dd > > fatal: bad object 0e61ab56e01655f02bfe4e6249e032e864b0f5dd > > The commit is in next-net. Not sure how to proceed, any idea? I see. Thanks. So it's not merged to Thomas tree yet. I normally take commits from there. Because I add a tag like following every time I pick a commit: [ upstream commit 5b9b65b14e05c106bb8229c0fe0b347315da7d00 ] If I take commits directly from next-* tree, the commit could have been changed while merging to Thomas tree, for two reasons: - the next-* could have done a rebase - we don't do "git merge" at Thomas tree However, if that commit is urgent, I think I could make it for 16.11.3 release with following tag: [ next-net commit 0e61ab56e01655f02bfe4e6249e032e864b0f5dd ] If not, I will postone it to 16.11.4. --yliu