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

_apply issues_

Submitter: Gregory Etelson <getelson@nvidia.com>
Date: 2020-10-16 12:51:07
Reply_mail: 20201016125108.22997-4-getelson@nvidia.com

DPDK git baseline:
	Repo:dpdk-next-net, CommitID: e6c3b082f1d2f4a89d0c4d3138797b9398d4318c
	Repo:dpdk, CommitID: 26015a9b007f2536b1689412e0e45e7032b7fe51


* Repo: dpdk-next-net
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 ethdev: allow negative values in flow rule types
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: allow negative values in flow rule types
error: sha1 information is lacking or useless (doc/guides/prog_guide/rte_flow.rst).
error: could not build fake ancestor
Patch failed at 0001 ethdev: allow negative values in flow rule types
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