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

_apply issues_

Submitter: Jeff Guo <jia.guo@intel.com>
Date: 2020-09-23 15:36:09
Reply_mail: 20200923153609.1151-1-jia.guo@intel.com

DPDK git baseline:
	Repo:dpdk-next-net-intel, CommitID: 6554ec412c45af32c2aa1636d0879063133f7ddc
	Repo:dpdk, CommitID: f0f5d844d138a1d6564ffe4eb0c56bf41a7cf7c3


* Repo: dpdk-next-net-intel
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_20_11.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_20_11.rst
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 (doc/guides/rel_notes/release_20_11.rst).
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