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

_apply issues_

Submitter: Ankur Dwivedi <adwivedi@marvell.com>
Date: 2020-12-19 06:54:56
Reply_mail: 20201219065456.24156-3-adwivedi@marvell.com

DPDK git baseline:
	Repo:dpdk-next-crypto, CommitID: d3fa7b89f0b893f051cb4cef1cbc961cb59f5721
	Repo:dpdk, CommitID: e682b020840a9035beacd24cba4f6baabcfaf5ff


* Repo: dpdk-next-crypto
Applying: crypto/octeontx2: add support for aes-cbc sha1-hmac
error: sha1 information is lacking or useless (doc/guides/cryptodevs/octeontx2.rst).
error: could not build fake ancestor
Patch failed at 0001 crypto/octeontx2: add support for aes-cbc sha1-hmac
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
Auto-merging doc/guides/rel_notes/release_21_02.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_21_02.rst
Auto-merging doc/guides/cryptodevs/octeontx2.rst
error: Failed to merge in the changes.
Patch failed at 0001 crypto/octeontx2: add support for aes-cbc sha1-hmac
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