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

_apply issues_

Submitter: Harman Kalra <hkalra@marvell.com>
Date: 2020-11-03 14:16:40
Reply_mail: 20201103141640.174043-1-hkalra@marvell.com

DPDK git baseline:
	Repo:dpdk-next-net-mrvl, CommitID: dd3509d49916af9c2bac64d009adf7f53ae1cae0
	Repo:dpdk, CommitID: 8809f78c7dd9f33a44a4f89c58fc91ded34296ed


* Repo: dpdk-next-net-mrvl
Applying: net/octeontx2: register dynamic mbuf timestamp field
error: sha1 information is lacking or useless (drivers/net/octeontx2/otx2_ethdev.c).
error: could not build fake ancestor
Patch failed at 0001 net/octeontx2: register dynamic mbuf timestamp field
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
Auto-merging drivers/net/octeontx2/otx2_ptp.c
Auto-merging drivers/net/octeontx2/otx2_ethdev.c
CONFLICT (content): Merge conflict in drivers/net/octeontx2/otx2_ethdev.c
error: Failed to merge in the changes.
Patch failed at 0001 net/octeontx2: register dynamic mbuf timestamp field
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