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

_apply issues_

Submitter: Patrick Fu <patrick.fu@intel.com>
Date: 2020-09-09 00:22:47
Reply_mail: 20200909002247.864844-4-patrick.fu@intel.com

DPDK git baseline:
	Repo:dpdk, CommitID: 54fa1f6a67d711f38aae61a79b284a84ce80e561


* Repo: dpdk
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): lib/Makefile deleted in HEAD and modified in lib/mirror: introduce traffic mirror API. Version lib/mirror: introduce traffic mirror API of lib/Makefile left in tree.
CONFLICT (modify/delete): config/common_base deleted in HEAD and modified in lib/mirror: introduce traffic mirror API. Version lib/mirror: introduce traffic mirror API of config/common_base left in tree.
error: Failed to merge in the changes.
Patch failed at 0001 lib/mirror: introduce traffic mirror 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