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

_apply issues_

Submitter: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
Date: 2020-10-16 16:44:40
Reply_mail: 1602866680-25920-7-git-send-email-viacheslavo@nvidia.com

DPDK git baseline:
	Repo:dpdk-next-net, CommitID: 4ff22f8c8900c9c6824e3e879ffb1e52393625cc
	Repo:dpdk, CommitID: 028c57407df4288f061698b95336a9e9a0cf75b3


* Repo: dpdk-next-net
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 0001 ethdev: introduce Rx buffer split
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
Applying: ethdev: introduce Rx buffer split
error: sha1 information is lacking or useless (doc/guides/rel_notes/deprecation.rst).
error: could not build fake ancestor
Patch failed at 0001 ethdev: introduce Rx buffer split
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