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

_apply issues_

Submitter: Jiayu Hu <jiayu.hu@intel.com>
Date: 2020-12-25 08:28:54
Reply_mail: 1608884934-106977-3-git-send-email-jiayu.hu@intel.com

DPDK git baseline:
	Repo:dpdk-next-virtio, CommitID: 44001b830b285daaae4f343cfa97e96c04f403b8
	Repo:dpdk, CommitID: e5e518edd622d63d8aaa1239a4d2cf8bdb438fb9


* Repo: dpdk-next-virtio
CONFLICT (content): Merge conflict in lib/librte_vhost/virtio_net.c
Auto-merging lib/librte_vhost/rte_vhost_async.h
CONFLICT (content): Merge conflict in lib/librte_vhost/rte_vhost_async.h
error: Failed to merge in the changes.
Patch failed at 0001 vhost: cleanup async enqueue
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 lib/librte_vhost/vhost_user.c
Auto-merging lib/librte_vhost/vhost.h
Auto-merging lib/librte_vhost/vhost.c
error: Failed to merge in the changes.
Patch failed at 0002 vhost: enhance async enqueue for small packets
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