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

_apply issues_

Submitter: Dekel Peled <dekelp@mellanox.com>
Date: 2020-08-04 16:01:53
Reply_mail: 50e5d2139368c54b414379b18a59ed46c12893f5.1596556981.git.dekelp@mellanox.com

DPDK git baseline:
	Repo:dpdk, CommitID: 6636b04b82897816e0e05134f55a578cb7e124bc


* 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 item struct
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