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

_apply issues_

Submitter: Feifei Wang <feifei.wang2@arm.com>
Date: 2020-07-09 06:12:10
Reply_mail: 20200709061212.15931-2-feifei.wang2@arm.com

DPDK git baseline:
	Repo:dpdk, CommitID: 2d6ed071a8b93ead509ff26914bdb8938efd7543


* Repo: dpdk
Auto-merging lib/librte_ring/rte_ring_version.map
CONFLICT (content): Merge conflict in lib/librte_ring/rte_ring_version.map
error: Failed to merge in the changes.
Patch failed at 0001 ring: remove experimental tag for ring reset 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