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

_apply issues_

Submitter: Jiang Mao <maox.jiang@intel.com>
Date: 2020-07-22 17:57:38
Reply_mail: 20200722175738.32490-2-maox.jiang@intel.com

DPDK git baseline:
	Repo:dpdk-next-net-intel, CommitID: c4930463986f78db902ce702c2102c53873a9b0e
	Repo:dpdk, CommitID: 3126c6e04118e92364571b7020f7bb1567bac694


* Repo: dpdk-next-net-intel
Auto-merging drivers/net/i40e/i40e_ethdev.h
Auto-merging drivers/net/i40e/i40e_ethdev.c
CONFLICT (content): Merge conflict in drivers/net/i40e/i40e_ethdev.c
error: Failed to merge in the changes.
Patch failed at 0001 net/i40e: fix binding interrupt without msix vectors
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/i40e/i40e_ethdev.h
Auto-merging drivers/net/i40e/i40e_ethdev.c
CONFLICT (content): Merge conflict in drivers/net/i40e/i40e_ethdev.c
error: Failed to merge in the changes.
Patch failed at 0001 net/i40e: fix binding interrupt without msix vectors
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