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

_apply issues_

Submitter: Alexander Kozyrev <akozyrev@nvidia.com>
Date: 2021-01-18 16:18:25
Reply_mail: 20210118161825.31516-3-akozyrev@nvidia.com

DPDK git baseline:
	Repo:dpdk-next-net, CommitID: 11fa6ef8189037a2408722462a1deb027a7d5c1b
	Repo:dpdk, CommitID: 4080917cbcb8fb41bf6b3618039a72cee0b7525e


* Repo: dpdk-next-net
CONFLICT (content): Merge conflict in lib/librte_ethdev/rte_flow.h
Auto-merging doc/guides/rel_notes/release_21_02.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_21_02.rst
error: Failed to merge in the changes.
Patch failed at 0001 ethdev: introduce generic modify rte flow action
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: ethdev: introduce generic modify rte flow action
error: sha1 information is lacking or useless (doc/guides/rel_notes/release_21_02.rst).
error: could not build fake ancestor
Patch failed at 0001 ethdev: introduce generic modify rte flow action
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