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

_apply issues_

Submitter: Anatoly Burakov <anatoly.burakov@intel.com>
Date: 2020-10-09 16:02:27
Reply_mail: a62daf67e397102939f2ab62982b4c6ac1fa8e4b.1602258833.git.anatoly.burakov@intel.com

DPDK git baseline:
	Repo:dpdk, CommitID: 7cf3d07c3adcb015c303e4cdf2ef9712a65ce46d


* Repo: dpdk
Auto-merging lib/librte_ethdev/rte_ethdev.c
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 0004 ethdev: add simple power management 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