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

_apply issues_

Submitter: Tejasree Kondoj <ktejasree@marvell.com>
Date: 2020-10-09 10:03:28
Reply_mail: 20201009100328.8739-1-ktejasree@marvell.com

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


* 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/octeontx2: add lookaside IPsec IPv6 support
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 drivers/crypto/octeontx2/otx2_cryptodev_ops.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 crypto/octeontx2: add lookaside IPsec IPv6 support
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