[dpdk-test-report] |FAILURE| pw(80976) [3/3] doc: announce new eventdev ABI changes

[dpdk-test-report] |FAILURE| pw(80976) [3/3] doc: announce new eventdev ABI changes

[sys_stv]

[-- Attachment #1: Type: text/plain, Size: 1592 bytes --]


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

_apply issues_

Submitter: Timothy McDaniel <timothy.mcdaniel@intel.com>
Date: 2020-10-15 18:07:17
Reply_mail: 1602785237-21843-4-git-send-email-timothy.mcdaniel@intel.com

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


* Repo: dpdk-next-eventdev
CONFLICT (content): Merge conflict in lib/librte_eventdev/rte_eventdev_version.map
Auto-merging lib/librte_eventdev/rte_eventdev_pmd_pci.h
CONFLICT (content): Merge conflict in lib/librte_eventdev/rte_eventdev_pmd_pci.h
error: Failed to merge in the changes.
Patch failed at 0001 eventdev: eventdev: express DLB/DLB2 PMD constraints
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
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/deprecation.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/deprecation.rst
error: Failed to merge in the changes.
Patch failed at 0002 doc: remove eventdev ABI change announcement
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