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

_apply issues_

Submitter: Anatoly Burakov <anatoly.burakov@intel.com>
Date: 2021-01-11 14:35:56
Reply_mail: 53f23eef1e34fb5677c140b62a1d5ce22f08b09a.1610375528.git.anatoly.burakov@intel.com

DPDK git baseline:
	Repo:dpdk, CommitID: b1fd151267e6791a7649090c185413293549d033


* Repo: dpdk
Falling back to patching base and 3-way merge...
Auto-merging lib/librte_eal/version.map
CONFLICT (content): Merge conflict in lib/librte_eal/version.map
error: Failed to merge in the changes.
Patch failed at 0001 eal: uninline power intrinsics
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