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

_apply issues_

Submitter: Stephen Hemminger <stephen@networkplumber.org>
Date: 2020-10-14 15:27:56
Reply_mail: 20201014152756.6518-19-stephen@networkplumber.org

DPDK git baseline:
	Repo:dpdk, CommitID: f4cbdbc7fbd2cf352d50f5ce7018a63dc5392b1b


* Repo: dpdk
Auto-merging doc/guides/rel_notes/release_20_11.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_20_11.rst
Auto-merging doc/guides/rel_notes/deprecation.rst
error: Failed to merge in the changes.
Patch failed at 0003 eal: rename lcore word choices
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