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

_apply issues_

Submitter: Timothy McDaniel <timothy.mcdaniel@intel.com>
Date: 2020-10-17 19:04:16
Reply_mail: 1602961456-17392-23-git-send-email-timothy.mcdaniel@intel.com

DPDK git baseline:
	Repo:dpdk-next-eventdev, CommitID: 0a5a3ba495ce9e4622befb31193bcbd6ef8a0fb0
	Repo:dpdk, CommitID: e8a83681f458d95d197bd37208fed3c3900def03


* Repo: dpdk-next-eventdev
Auto-merging doc/guides/rel_notes/release_20_11.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_20_11.rst
Auto-merging MAINTAINERS
error: Failed to merge in the changes.
Patch failed at 0022 doc: Add new DLB eventdev driver to relnotes
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 doc/guides/rel_notes/release_20_11.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_20_11.rst
Auto-merging MAINTAINERS
error: Failed to merge in the changes.
Patch failed at 0022 doc: Add new DLB eventdev driver to relnotes
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