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

_apply issues_

Submitter: Hyong Youb Kim <hyonkim@cisco.com>
Date: 2020-07-03 02:23:51
Reply_mail: 20200703022351.17172-3-hyonkim@cisco.com

DPDK git baseline:
	Repo:dpdk-next-net, CommitID: 24cd1b529f35f106d323ebdd4df0203261824dcc
	Repo:dpdk, CommitID: 24cd1b529f35f106d323ebdd4df0203261824dcc


* Repo: dpdk-next-net
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): doc/guides/rel_notes/release_20_08.rst deleted in HEAD and modified in net/enic: support VLAN push and pop flow actions. Version net/enic: support VLAN push and pop flow actions of doc/guides/rel_notes/release_20_08.rst left in tree.
error: Failed to merge in the changes.
Patch failed at 0001 net/enic: support VLAN push and pop flow actions
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/enic: support VLAN push and pop flow actions
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/enic: support VLAN push and pop flow actions
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