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

_apply issues_

Submitter: Zhang, AlvinX <alvinx.zhang@intel.com>
Date: 2020-09-14 09:03:15
Reply_mail: 20200914090316.49740-1-alvinx.zhang@intel.com

DPDK git baseline:
	Repo:dpdk-next-net-intel, CommitID: eeb8ae83cc2476b3256a78e44f2c3d3cb410aa44
	Repo:dpdk, CommitID: e41d27a68df6939bef97a4afa6ffc32eb8b2c2c1


* 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 0001 net/iavf: support outer IP hash for no inner GTPU
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 no inner GTPU
error: sha1 information is lacking or useless (drivers/net/iavf/iavf_hash.c).
error: could not build fake ancestor
Patch failed at 0001 net/iavf: support outer IP hash for no inner GTPU
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