From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Monjalon Subject: Re: [PATCH v5 0/4] introduce new tunnel types Date: Thu, 19 Apr 2018 16:57:51 +0200 Message-ID: <11547334.NsiGZzvTcj@xps> References: <20180413110218.105894-1-xuemingl@mellanox.com> <8CEF83825BEC744B83065625E567D7C24E0AF50A@IRSMSX108.ger.corp.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7Bit Cc: "Iremonger, Bernard" , "Lu, Wenzhuo" , "Wu, Jingjing" , Adrien Mazarguil , =?ISO-8859-1?Q?N=E9lio?= Laranjeiro , Shahaf Shuler , "dev@dpdk.org" , Olivier Matz To: "Xueming(Steven) Li" , ferruh.yigit@intel.com Return-path: Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by dpdk.org (Postfix) with ESMTP id 49DB1CF66 for ; Thu, 19 Apr 2018 16:57:55 +0200 (CEST) In-Reply-To: List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 19/04/2018 16:24, Xueming(Steven) Li: > From: Iremonger, Bernard > > 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?