Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/81783

_apply issues_

Submitter: Andrew Rybchenko <arybchenko@solarflare.com>
Date: 2020-10-22 10:06:20
Reply_mail: 1603361181-21556-4-git-send-email-arybchenko@solarflare.com

DPDK git baseline:
	Repo:dpdk-next-net, CommitID: 041eb9fb823755b4272b329df2e9a2f00766abf0
	Repo:dpdk, CommitID: 30105f664f8ebbecd878deff7f0733a3f92edd17


* Repo: dpdk-next-net
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_20_11.rst
Auto-merging doc/guides/rel_notes/deprecation.rst
Auto-merging app/test-pmd/cmdline.c
error: Failed to merge in the changes.
Patch failed at 0001 ethdev: remove API to config L2 tunnel EtherType
Use 'git am --show-current-patch' to see the failed 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".

* Repo: dpdk
Applying: ethdev: remove API to config L2 tunnel EtherType
error: sha1 information is lacking or useless (app/test-pmd/cmdline.c).
error: could not build fake ancestor
Patch failed at 0001 ethdev: remove API to config L2 tunnel EtherType
Use 'git am --show-current-patch' to see the failed 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".
DPDK STV team