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

_apply issues_

Submitter: Ori Kam <orika@nvidia.com>
Date: 2020-11-04 12:59:18
Reply_mail: 20201104125918.9751-3-orika@nvidia.com

DPDK git baseline:
	Repo:dpdk-next-net, CommitID: 9f13cf46319431e96319e7fc2809e1176e514dd8
	Repo:dpdk, CommitID: a5c79ad0f0e4e2b61eff2ebb19ae556f4e257c47


* Repo: dpdk-next-net
Falling back to patching base and 3-way merge...
Auto-merging lib/librte_ethdev/rte_flow.h
CONFLICT (content): Merge conflict in lib/librte_ethdev/rte_flow.h
error: Failed to merge in the changes.
Patch failed at 0001 ethdev: add item/action for SFT
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".

* Repo: dpdk
Falling back to patching base and 3-way merge...
Auto-merging lib/librte_ethdev/rte_flow.h
CONFLICT (content): Merge conflict in lib/librte_ethdev/rte_flow.h
error: Failed to merge in the changes.
Patch failed at 0001 ethdev: add item/action for SFT
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