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

_apply issues_

Submitter: Timothy McDaniel <timothy.mcdaniel@intel.com>
Date: 2020-10-12 19:01:24
Reply_mail: 1602529284-29232-1-git-send-email-timothy.mcdaniel@intel.com

DPDK git baseline:
	Repo:dpdk-next-eventdev, CommitID: eb1d398ddc3df4a79328af16b9b93dd6ff57d2ec
	Repo:dpdk, CommitID: 7cf3d07c3adcb015c303e4cdf2ef9712a65ce46d


* Repo: dpdk-next-eventdev
Auto-merging lib/librte_eventdev/rte_eventdev_version.map
CONFLICT (content): Merge conflict in lib/librte_eventdev/rte_eventdev_version.map
Auto-merging lib/librte_eventdev/rte_eventdev_pmd_pci.h
error: Failed to merge in the changes.
Patch failed at 0001 eventdev: add PCI probe named convenience function
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
Auto-merging lib/librte_eventdev/rte_eventdev_version.map
CONFLICT (content): Merge conflict in lib/librte_eventdev/rte_eventdev_version.map
Auto-merging lib/librte_eventdev/rte_eventdev_pmd_pci.h
error: Failed to merge in the changes.
Patch failed at 0001 eventdev: add PCI probe named convenience function
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