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

_apply issues_

Submitter: Shiri Kuzin <shirik@mellanox.com>
Date: 2020-07-02 15:16:14
Reply_mail: 1593702974-30927-1-git-send-email-shirik@mellanox.com

DPDK git baseline:
	Repo:dpdk-next-net, CommitID: 24cd1b529f35f106d323ebdd4df0203261824dcc
	Repo:dpdk, CommitID: 24cd1b529f35f106d323ebdd4df0203261824dcc


* Repo: dpdk-next-net
Auto-merging app/test-pmd/testpmd.c
Auto-merging app/test-pmd/parameters.c
error: Failed to merge in the changes.
Patch failed at 0001 app/testpmd: add 5tswap forwarding engine
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 app/test-pmd/testpmd.c
Auto-merging app/test-pmd/parameters.c
error: Failed to merge in the changes.
Patch failed at 0001 app/testpmd: add 5tswap forwarding engine
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