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

_apply issues_

Submitter: Bing Zhao <bingz@nvidia.com>
Date: 2020-10-15 05:35:24
Reply_mail: 1602740124-397688-6-git-send-email-bingz@nvidia.com

DPDK git baseline:
	Repo:dpdk-next-net, CommitID: 67438840ac9b48d1aec6369f41c610e4cf676d78
	Repo:dpdk, CommitID: bf32a357e2c625ccc1de95f2068519ad87fdc3e9


* Repo: dpdk-next-net
Auto-merging lib/librte_ethdev/rte_ethdev.c
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: add hairpin bind and unbind APIs
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: add new attributes to hairpin config
error: sha1 information is lacking or useless (doc/guides/prog_guide/rte_flow.rst).
error: could not build fake ancestor
Patch failed at 0002 ethdev: add new attributes to hairpin config
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