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

_apply issues_

Submitter: Jeff Guo <jia.guo@intel.com>
Date: 2021-01-12 09:32:43
Reply_mail: 20210112093243.40840-4-jia.guo@intel.com

DPDK git baseline:
	Repo:dpdk-next-net-intel, CommitID: 251c17cb7d6692ccefa047a46e81e253360165c1
	Repo:dpdk, CommitID: b1fd151267e6791a7649090c185413293549d033


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