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

_apply issues_

Submitter: Anatoly Burakov <anatoly.burakov@intel.com>
Date: 2021-01-14 14:46:13
Reply_mail: 258d6e9ae723318bdca531c1a5b51dcebec48435.1610635488.git.anatoly.burakov@intel.com

DPDK git baseline:
	Repo:dpdk, CommitID: 5881b2d2d904b4e35cb7f7d27bb8431a8bd906f8


* 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 0006 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