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

_apply issues_

Submitter: Phil Yang <phil.yang@arm.com>
Date: 2020-07-07 15:54:51
Reply_mail: 1594137293-22468-2-git-send-email-phil.yang@arm.com

DPDK git baseline:
	Repo:dpdk-next-eventdev, CommitID: 3f598508108b26fe1ce0767356dbcd6b80252b0a
	Repo:dpdk, CommitID: d25d116d9ccdf83b1b167cd9cedf9f7c0d7b61f2


* Repo: dpdk-next-eventdev
Auto-merging lib/librte_eventdev/rte_event_timer_adapter.c
CONFLICT (content): Merge conflict in lib/librte_eventdev/rte_event_timer_adapter.c
error: Failed to merge in the changes.
Patch failed at 0001 eventdev: fix race condition on timer list counter
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_event_timer_adapter.c
CONFLICT (content): Merge conflict in lib/librte_eventdev/rte_event_timer_adapter.c
error: Failed to merge in the changes.
Patch failed at 0001 eventdev: fix race condition on timer list counter
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