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

_apply issues_

Submitter: Andrey Vesnovaty <andreyv@nvidia.com>
Date: 2020-10-03 22:06:19
Reply_mail: 20201003220619.19231-11-andreyv@nvidia.com

DPDK git baseline:
	Repo:dpdk-next-net, CommitID: f5845e7fe21dd964c71d613a3582d0d54ceef566
	Repo:dpdk, CommitID: f459f6038283a1ad3b0f4d98edcedae70043428f


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

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