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

_apply issues_

Submitter: Nagadheeraj Rottela <rnagadheeraj@marvell.com>
Date: 2020-10-09 05:57:25
Reply_mail: 20201009055725.47329-3-rnagadheeraj@marvell.com

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


* Repo: dpdk-next-crypto
Falling back to patching base and 3-way merge...
Auto-merging drivers/crypto/nitrox/nitrox_sym_reqmgr.c
CONFLICT (content): Merge conflict in drivers/crypto/nitrox/nitrox_sym_reqmgr.c
error: Failed to merge in the changes.
Patch failed at 0001 crypto/nitrox: support AES-GCM
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
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 crypto/nitrox: support cipher only crypto operations
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