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

_apply issues_

Submitter: Ibtisam Tariq <ibtisam.tariq@emumba.com>
Date: 2020-10-29 12:53:39
Reply_mail: 20201029125339.30916-8-ibtisam.tariq@emumba.com

DPDK git baseline:
	Repo:dpdk-next-virtio, CommitID: 927ce56c9762a0fe1b18355eb94d0f77515529b2
	Repo:dpdk, CommitID: f72299fd157deee129c5d8415f9a58b1af0bf84c


* Repo: dpdk-next-virtio
Falling back to patching base and 3-way merge...
Auto-merging examples/vhost/main.c
CONFLICT (content): Merge conflict in examples/vhost/main.c
error: Failed to merge in the changes.
Patch failed at 0006 examples/vhost: enhance getopt_long usage
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
A	examples/tep_termination/main.c
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): examples/tep_termination/main.c deleted in HEAD and modified in examples/tep_termination: enhance getopt_long usage. Version examples/tep_termination: enhance getopt_long usage of examples/tep_termination/main.c left in tree.
error: Failed to merge in the changes.
Patch failed at 0008 examples/tep_termination: enhance getopt_long usage
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