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

_apply issues_

Submitter: Jeff Guo <jia.guo@intel.com>
Date: 2020-07-03 03:56:56
Reply_mail: 20200703035656.87908-4-jia.guo@intel.com

DPDK git baseline:
	Repo:dpdk-next-net-intel, CommitID: 24cd1b529f35f106d323ebdd4df0203261824dcc
	Repo:dpdk, CommitID: 24cd1b529f35f106d323ebdd4df0203261824dcc


* Repo: dpdk-next-net-intel
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: refactor for hash flow
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/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: refactor for hash flow
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