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

_apply issues_

Submitter: Parav Pandit <parav@mellanox.com>
Date: 2020-07-03 09:12:59
Reply_mail: 20200703091259.2108996-11-parav@mellanox.com

DPDK git baseline:
	Repo:dpdk, CommitID: 24cd1b529f35f106d323ebdd4df0203261824dcc


* Repo: dpdk
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): lib/librte_eal/include/rte_bitops.h deleted in HEAD and modified in eal: introduce macros for getting value for bit. Version eal: introduce macros for getting value for bit of lib/librte_eal/include/rte_bitops.h left in tree.
error: Failed to merge in the changes.
Patch failed at 0001 eal: introduce macros for getting value for bit
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