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

_apply issues_

Submitter: Jiawei Wang <jiaweiw@mellanox.com>
Date: 2020-07-02 18:43:05
Reply_mail: 1593715390-83047-3-git-send-email-jiaweiw@mellanox.com

DPDK git baseline:
	Repo:dpdk-next-net, CommitID: 24cd1b529f35f106d323ebdd4df0203261824dcc
	Repo:dpdk, CommitID: 24cd1b529f35f106d323ebdd4df0203261824dcc


* Repo: dpdk-next-net
CONFLICT (modify/delete): doc/guides/rel_notes/release_20_08.rst deleted in HEAD and modified in ethdev: introduce sample action for rte flow. Version ethdev: introduce sample action for rte flow of doc/guides/rel_notes/release_20_08.rst left in tree.
Auto-merging doc/guides/prog_guide/rte_flow.rst
error: Failed to merge in the changes.
Patch failed at 0001 ethdev: introduce sample action for rte flow
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
CONFLICT (modify/delete): doc/guides/rel_notes/release_20_08.rst deleted in HEAD and modified in ethdev: introduce sample action for rte flow. Version ethdev: introduce sample action for rte flow of doc/guides/rel_notes/release_20_08.rst left in tree.
Auto-merging doc/guides/prog_guide/rte_flow.rst
error: Failed to merge in the changes.
Patch failed at 0001 ethdev: introduce sample action for rte flow
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