On 4/19/2018 3:57 PM, Thomas Monjalon wrote: > 19/04/2018 16:24, Xueming(Steven) Li: >> From: Iremonger, Bernard <bernard.iremon...@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
