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

_apply issues_

Submitter: Jeff Guo <jia.guo@intel.com>
Date: 2020-09-09 02:54:15
Reply_mail: 20200909025415.6185-1-jia.guo@intel.com

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


* Repo: dpdk-next-net-intel
Auto-merging drivers/net/iavf/iavf_vchnl.c
Auto-merging drivers/net/iavf/iavf_ethdev.c
CONFLICT (modify/delete): drivers/net/iavf/Makefile deleted in HEAD and modified in net/iavf: support flex desc metadata extraction. Version net/iavf: support flex desc metadata extraction of drivers/net/iavf/Makefile left in tree.
error: Failed to merge in the changes.
Patch failed at 0001 net/iavf: support flex desc metadata extraction
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: support flex desc metadata extraction
error: sha1 information is lacking or useless (drivers/net/iavf/iavf.h).
error: could not build fake ancestor
Patch failed at 0001 net/iavf: support flex desc metadata extraction
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