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

_apply issues_

Submitter: Guinan Sun <guinanx.sun@intel.com>
Date: 2020-07-07 06:33:33
Reply_mail: 20200707063333.56791-1-guinanx.sun@intel.com

DPDK git baseline:
	Repo:dpdk-next-net-intel, CommitID: bba49f3a4124870467f20a03afe8ef200e37e3ef
	Repo:dpdk, CommitID: fea5a82f5643901f8259bb1250acf53d6be4b9cb


* Repo: dpdk-next-net-intel
Auto-merging doc/guides/rel_notes/release_20_08.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_20_08.rst
error: Failed to merge in the changes.
Patch failed at 0001 net/i40e: support cloud filter with L4 port
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/i40e: support cloud filter with L4 port
error: sha1 information is lacking or useless (doc/guides/rel_notes/release_20_08.rst).
error: could not build fake ancestor
Patch failed at 0001 net/i40e: support cloud filter with L4 port
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