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

_apply issues_

Submitter: Fu, Patrick <patrick.fu@intel.com>
Date: 2020-07-03 12:21:46
Reply_mail: 1593778906-47832-3-git-send-email-patrick.fu@intel.com

DPDK git baseline:
	Repo:dpdk, CommitID: f6d7f405760610e9c61994c846fe59b3516591aa


* Repo: dpdk
Auto-merging lib/librte_vhost/vhost.c
CONFLICT (content): Merge conflict in lib/librte_vhost/vhost.c
error: Failed to merge in the changes.
Patch failed at 0001 vhost: introduce async enqueue registration 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