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

_apply issues_

Submitter: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Date: 2020-10-12 11:19:13
Reply_mail: 20201012111913.705225-2-pablo.de.lara.guarch@intel.com

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


* 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 0001 crypto/aesni_gcm: support SGL on AES-GMAC
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: crypto/aesni_gcm: support SGL on AES-GMAC
error: sha1 information is lacking or useless (doc/guides/rel_notes/release_20_11.rst).
error: could not build fake ancestor
Patch failed at 0001 crypto/aesni_gcm: support SGL on AES-GMAC
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