From mboxrd@z Thu Jan  1 00:00:00 1970
From: Yuanhan Liu <yliu@fridaylinux.org>
Subject: Re: [dpdk-stable] 16.11.3 (LTS) patches review and test
Date: Mon, 21 Aug 2017 17:23:26 +0800
Message-ID: <20170821092326.GQ9612@yliu-home>
References: <20170818104545.GN9612@yliu-home>
 <c9b5eef5-9b7c-2b86-c637-e75a1e386fed@redhat.com>
 <20170821034011.GO9612@yliu-home>
 <2d8dbb48-978f-94fb-1282-8b5c4ea30220@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: Kevin Traynor <ktraynor@redhat.com>, dpdk stable <stable@dpdk.org>,
 dev@dpdk.org
To: Ferruh Yigit <ferruh.yigit@intel.com>
Return-path: <dev-bounces@dpdk.org>
Received: from mail-pg0-f53.google.com (mail-pg0-f53.google.com [74.125.83.53])
 by dpdk.org (Postfix) with ESMTP id BB9657D6A
 for <dev@dpdk.org>; Mon, 21 Aug 2017 11:23:34 +0200 (CEST)
Received: by mail-pg0-f53.google.com with SMTP id y129so96675027pgy.4
 for <dev@dpdk.org>; Mon, 21 Aug 2017 02:23:34 -0700 (PDT)
Content-Disposition: inline
In-Reply-To: <2d8dbb48-978f-94fb-1282-8b5c4ea30220@intel.com>
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

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 <qi.z.zhang@intel.com>
> >> 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