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

_apply issues_

Submitter: Vladimir Medvedkin <vladimir.medvedkin@intel.com>
Date: 2020-10-07 16:10:42
Reply_mail: f73d069b588e6a8b6125b0fc2cfb03143dde26d4.1602086562.git.vladimir.medvedkin@intel.com

DPDK git baseline:
	Repo:dpdk, CommitID: f459f6038283a1ad3b0f4d98edcedae70043428f


* 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 0004 fib: introduce AVX512 lookup
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