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

_apply issues_

Submitter: Min Hu (Connor) <humin29@huawei.com>
Date: 2020-10-08 10:02:56
Reply_mail: 1602151376-23766-4-git-send-email-humin29@huawei.com

DPDK git baseline:
	Repo:dpdk-next-net, CommitID: b6001715e50220ee99d0bdc008d299f73ad6c442
	Repo:dpdk, CommitID: 7cf3d07c3adcb015c303e4cdf2ef9712a65ce46d


* Repo: dpdk-next-net
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_20_11.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_20_11.rst
error: Failed to merge in the changes.
Patch failed at 0001 ethdev: introduce FEC API
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_20_11.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_20_11.rst
error: Failed to merge in the changes.
Patch failed at 0001 ethdev: introduce FEC API
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