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

_apply issues_

Submitter: Jeff Guo <jia.guo@intel.com>
Date: 2021-01-15 05:15:42
Reply_mail: 20210115051542.98748-3-jia.guo@intel.com

DPDK git baseline:
	Repo:dpdk-next-net, CommitID: 75253e43a1642f31ba0ef44ebb69cdf5aeb92305
	Repo:dpdk, CommitID: b9d60b5434e9df46f53fc1e3aa4b065f261adb83


* Repo: dpdk-next-net
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_21_02.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_21_02.rst
error: Failed to merge in the changes.
Patch failed at 0001 ethdev: add new tunnel type for eCPRI
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
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_21_02.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_21_02.rst
error: Failed to merge in the changes.
Patch failed at 0001 ethdev: add new tunnel type for eCPRI
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