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

_apply issues_

Submitter: Sachin Saxena (OSS) <sachin.saxena@oss.nxp.com>
Date: 2020-09-28 08:57:13
Reply_mail: 20200928085713.13560-5-sachin.saxena@oss.nxp.com

DPDK git baseline:
	Repo:dpdk-next-net, CommitID: fc396e3ff5546c326212dea5625d7f1eb5fadd4b
	Repo:dpdk, CommitID: f5d6738c2ec10170b0e03eb9ff95544be0559641


* Repo: dpdk-next-net
Applying: net/dpaa: release port upon close
error: sha1 information is lacking or useless (drivers/net/dpaa/dpaa_ethdev.c).
error: could not build fake ancestor
Patch failed at 0001 net/dpaa: release port upon close
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
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/dpaa/dpaa_ethdev.c
CONFLICT (content): Merge conflict in drivers/net/dpaa/dpaa_ethdev.c
error: Failed to merge in the changes.
Patch failed at 0001 net/dpaa: release port upon close
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