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

_apply issues_

Submitter: Raslan Darawsheh <rasland@nvidia.com>
Date: 2020-11-24 09:54:37
Reply_mail: 20201124095437.17517-1-rasland@nvidia.com

DPDK git baseline:
	Repo:dpdk, CommitID: 61bd270c4adc7dff1f9c8af1f2c72618860d4395


* 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 0001 doc: add tested platforms with Mellanox NICs
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