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

_apply issues_

Submitter: Phil Yang <phil.yang@arm.com>
Date: 2020-09-11 05:26:37
Reply_mail: 1599801997-19880-3-git-send-email-phil.yang@arm.com

DPDK git baseline:
	Repo:dpdk, CommitID: 25efc61539603dbe634cd1a5b84c956c55893e41


* 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 0002 eal: remove RTE CIO barriers
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