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

_apply issues_

Submitter: Haiyue Wang <haiyue.wang@intel.com>
Date: 2021-01-18 08:24:08
Reply_mail: 20210118082408.82713-1-haiyue.wang@intel.com

DPDK git baseline:
	Repo:dpdk-next-net-intel, CommitID: 5c527f7b482cc6eda06aa7cfe831e2303fe99599
	Repo:dpdk, CommitID: d559d2048e368400feb455fa2b082eee81d2f5cc


* Repo: dpdk-next-net-intel
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/ice/ice_dcf_parent.c
CONFLICT (content): Merge conflict in drivers/net/ice/ice_dcf_parent.c
error: Failed to merge in the changes.
Patch failed at 0001 net/ice: refactor DCF VLAN handling
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/ice/ice_dcf_parent.c
CONFLICT (content): Merge conflict in drivers/net/ice/ice_dcf_parent.c
error: Failed to merge in the changes.
Patch failed at 0001 net/ice: refactor DCF VLAN handling
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