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

_apply issues_

Submitter: Kalesh A P <kalesh-anakkur.purayil@broadcom.com>
Date: 2020-10-09 03:48:32
Reply_mail: 20201009034832.10302-4-kalesh-anakkur.purayil@broadcom.com

DPDK git baseline:
	Repo:dpdk-next-net, CommitID: 466c55e4d85b39da248492d0245465e334629041
	Repo:dpdk, CommitID: 0e995cbcfc81e1d86d92dfb871ebe14ee5b8d9e4


* Repo: dpdk-next-net
Auto-merging doc/guides/rel_notes/release_20_11.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_20_11.rst
Auto-merging app/test-pmd/testpmd.c
error: Failed to merge in the changes.
Patch failed at 0003 app/testpmd: handle device recovery event
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: app/testpmd: handle device recovery event
error: sha1 information is lacking or useless (doc/guides/rel_notes/release_20_11.rst).
error: could not build fake ancestor
Patch failed at 0003 app/testpmd: handle device recovery event
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