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

_apply issues_

Submitter: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
Date: 2020-10-05 06:26:47
Reply_mail: 1601879207-6504-6-git-send-email-viacheslavo@nvidia.com

DPDK git baseline:
	Repo:dpdk-next-net, CommitID: b6001715e50220ee99d0bdc008d299f73ad6c442
	Repo:dpdk, CommitID: 7cf3d07c3adcb015c303e4cdf2ef9712a65ce46d


* Repo: dpdk-next-net
Auto-merging lib/librte_ethdev/rte_ethdev.c
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/release_20_11.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