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

_apply issues_

Submitter: Zhang, AlvinX <alvinx.zhang@intel.com>
Date: 2020-09-10 03:36:52
Reply_mail: 20200910033652.30632-2-alvinx.zhang@intel.com

DPDK git baseline:
	Repo:dpdk-next-net-intel, CommitID: 30507eead8b4e3e6b4e2b8491fb8263c758a8925
	Repo:dpdk, CommitID: a4235b781f5d7a7bda204f24a9d048696a2a484e


* Repo: dpdk-next-net-intel
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/iavf/iavf_hash.c
CONFLICT (content): Merge conflict in drivers/net/iavf/iavf_hash.c
error: Failed to merge in the changes.
Patch failed at 0002 net/iavf: support outer IP hash for GTPC
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: net/iavf: support outer IP hash for GTPC
error: sha1 information is lacking or useless (drivers/net/iavf/iavf_hash.c).
error: could not build fake ancestor
Patch failed at 0002 net/iavf: support outer IP hash for GTPC
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