From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ferruh Yigit <ferruh.yigit@intel.com>
Subject: Re: [PATCH v5 0/4] introduce new tunnel types
Date: Thu, 19 Apr 2018 20:56:40 +0100
Message-ID: <3eaaf501-883e-6fd8-50ae-220b7c2db043@intel.com>
References: <20180413110218.105894-1-xuemingl@mellanox.com>
 <8CEF83825BEC744B83065625E567D7C24E0AF50A@IRSMSX108.ger.corp.intel.com>
 <DB5PR05MB16712A7CD4B69D738C5055F4ACB50@DB5PR05MB1671.eurprd05.prod.outlook.com>
 <11547334.NsiGZzvTcj@xps>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
Cc: "Iremonger, Bernard" <bernard.iremonger@intel.com>,
 "Lu, Wenzhuo" <wenzhuo.lu@intel.com>, "Wu, Jingjing"
 <jingjing.wu@intel.com>, Adrien Mazarguil <adrien.mazarguil@6wind.com>,
 =?UTF-8?Q?N=c3=a9lio_Laranjeiro?= <nelio.laranjeiro@6wind.com>,
 Shahaf Shuler <shahafs@mellanox.com>, "dev@dpdk.org" <dev@dpdk.org>,
 Olivier Matz <olivier.matz@6wind.com>
To: Thomas Monjalon <thomas@monjalon.net>,
 "Xueming(Steven) Li" <xuemingl@mellanox.com>
Return-path: <dev-bounces@dpdk.org>
Received: from mga07.intel.com (mga07.intel.com [134.134.136.100])
 by dpdk.org (Postfix) with ESMTP id A49027CC2
 for <dev@dpdk.org>; Thu, 19 Apr 2018 21:56:46 +0200 (CEST)
In-Reply-To: <11547334.NsiGZzvTcj@xps>
Content-Language: en-US
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://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: <https://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 4/19/2018 3:57 PM, Thomas Monjalon wrote:
> 19/04/2018 16:24, Xueming(Steven) Li:
>> From: Iremonger, Bernard <bernard.iremonger@intel.com>
>>> I have just cloned the current dpdk master, patch 3 still fails to apply, dpdk-dev-v5-3-4-app-testpmd-
>>> introduce-new-tunnel-VXLAN-GPE.patch
>>>
>>> git am ./dpdk-dev-v5-3-4-app-testpmd-introduce-new-tunnel-VXLAN-GPE.patch
>>> Applying: app/testpmd: introduce new tunnel VXLAN-GPE
>>> error: patch failed: app/test-pmd/config.c:997
>>> error: app/test-pmd/config.c: patch does not apply Patch failed at 0001 app/testpmd: introduce new
>>> tunnel VXLAN-GPE The copy of the patch that failed is found in:
>>>    /root/dpdk_temp/.git/rebase-apply/patch
>>> When you have resolved this problem, run "git am --continue".
>>> If you prefer to skip this patch, run "git am --skip" instead.
>>> To restore the original branch and stop patching, run "git am --abort
>>>
>>
>> You are correct, I can reproduce it now. Will send out a new v6 series soon, thanks.
> 
> You should rebase on top of next-net.
> Ferruh, you confirm you will take those patches in next-net?

Yes, I was thinking this for next-net, because it is ethdev related