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

_apply issues_

Submitter: Timothy McDaniel <timothy.mcdaniel@intel.com>
Date: 2020-10-14 17:35:05
Reply_mail: 1602696905-10960-1-git-send-email-timothy.mcdaniel@intel.com

DPDK git baseline:
	Repo:dpdk-next-eventdev, CommitID: 1d41eebe8ff116f6e5bd7e665ea5bc8c9caec7eb
	Repo:dpdk, CommitID: 4fa3a084beb664103ba02eb22fd4ae68607d6ce2


* Repo: dpdk-next-eventdev
Applying: eventdev: add PCI probe named convenience function
error: sha1 information is lacking or useless (lib/librte_eventdev/rte_eventdev_pmd_pci.h).
error: could not build fake ancestor
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