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

_apply issues_

Submitter: Konstantin Ananyev <konstantin.ananyev@intel.com>
Date: 2020-07-02 14:10:27
Reply_mail: 20200702141027.18447-3-konstantin.ananyev@intel.com

DPDK git baseline:
	Repo:dpdk, CommitID: f6d7f405760610e9c61994c846fe59b3516591aa


* Repo: dpdk
CONFLICT (content): Merge conflict in app/test/test_ring_stress.h
Auto-merging app/test/test_ring_stress.c
error: Failed to merge in the changes.
Patch failed at 0001 test/ring: add stress test for ST peek 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