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

_apply issues_

Submitter: Konstantin Ananyev <konstantin.ananyev@intel.com>
Date: 2020-09-15 17:04:56
Reply_mail: 20200915170456.7204-4-konstantin.ananyev@intel.com

DPDK git baseline:
	Repo:dpdk, CommitID: e41d27a68df6939bef97a4afa6ffc32eb8b2c2c1


* 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 examples/l3fwd-acl: add source and destination MAC update
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