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

_apply issues_

Submitter: Chautru, Nicolas <nicolas.chautru@intel.com>
Date: 2020-09-23 02:19:46
Reply_mail: 1600827586-73414-12-git-send-email-nicolas.chautru@intel.com

DPDK git baseline:
	Repo:dpdk, CommitID: a4ab862e99c49b7b9e57c5844a1843b0e3d93ebc


* 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 0003 drivers/baseband: add PMD for ACC100
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