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

_apply issues_

Submitter: Dekel Peled <dekelp@mellanox.com>
Date: 2020-08-06 10:45:07
Reply_mail: d7071384e8ac134037c6c6d3aa7a81809c4a3fa1.1596710789.git.dekelp@mellanox.com

DPDK git baseline:
	Repo:dpdk, CommitID: 2ddb77944ab2a71074b33835711c5c7bf4a94959


* 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 0001 doc: announce change in ETH and VLAN item structs
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