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

_apply issues_

Submitter: Ting Xu <ting.xu@intel.com>
Date: 2020-09-09 07:20:28
Reply_mail: 20200909072028.16726-3-ting.xu@intel.com

DPDK git baseline:
	Repo:dpdk-next-net-intel, CommitID: 2e2fec2511ecbfc66a5b5b3db7831dcae1d3a52b
	Repo:dpdk, CommitID: 2dceae68f94ccad219ec24ef7c6bbbc13c14a9a3


* Repo: dpdk-next-net-intel
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/iavf/iavf_vchnl.c
CONFLICT (content): Merge conflict in drivers/net/iavf/iavf_vchnl.c
error: Failed to merge in the changes.
Patch failed at 0002 net/iavf: enable large VF configuration
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
Applying: net/iavf: add IAVF request queues
error: sha1 information is lacking or useless (drivers/net/iavf/iavf.h).
error: could not build fake ancestor
Patch failed at 0001 net/iavf: add IAVF request queues
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