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

_apply issues_

Submitter: Akhil Goyal <akhil.goyal@nxp.com>
Date: 2020-10-12 14:10:06
Reply_mail: 20201012141006.31463-9-akhil.goyal@nxp.com

DPDK git baseline:
	Repo:dpdk-next-crypto, CommitID: fc0814ea7ab507467d001d2a3a7d2a3747701a78
	Repo:dpdk, CommitID: d9739192a77d6eab3b1d6b7df7e40a4aca9cf145


* Repo: dpdk-next-crypto
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 0002 security: modify PDCP xform to support SDAP
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: security: modify PDCP xform to support SDAP
error: sha1 information is lacking or useless (doc/guides/rel_notes/release_20_11.rst).
error: could not build fake ancestor
Patch failed at 0002 security: modify PDCP xform to support SDAP
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