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

_apply issues_

Submitter: Xiaoyun Li <xiaoyun.li@intel.com>
Date: 2020-10-21 02:10:44
Reply_mail: 20201021021044.38043-1-xiaoyun.li@intel.com

DPDK git baseline:
	Repo:dpdk-next-net, CommitID: 041eb9fb823755b4272b329df2e9a2f00766abf0
	Repo:dpdk, CommitID: 4669252e0421aaf06ff86d5339f970ebe72cbf22


* Repo: dpdk-next-net
Removing doc/guides/sample_app_ug/img/tep_termination_arch.svg
Auto-merging doc/guides/rel_notes/release_20_11.rst
Auto-merging MAINTAINERS
error: Failed to merge in the changes.
Patch failed at 0001 examples/tep_term: deprecate this example
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
Removing doc/guides/sample_app_ug/img/tep_termination_arch.svg
Auto-merging doc/guides/rel_notes/release_20_11.rst
Auto-merging MAINTAINERS
error: Failed to merge in the changes.
Patch failed at 0001 examples/tep_term: deprecate this example
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