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

_apply issues_

Submitter: Wei Zhao <wei.zhao1@intel.com>
Date: 2020-07-03 06:19:35
Reply_mail: 20200703061938.13045-3-wei.zhao1@intel.com

DPDK git baseline:
	Repo:dpdk-next-net-intel, CommitID: 08e4b763a6ee4acec39bcdc2b33e39223ea1064e
	Repo:dpdk, CommitID: 0fc601af3a722ca3ed8bc7cba4c01e377513cdb3


* Repo: dpdk-next-net-intel
Auto-merging drivers/net/ice/ice_switch_filter.c
CONFLICT (content): Merge conflict in drivers/net/ice/ice_switch_filter.c
error: Failed to merge in the changes.
Patch failed at 0001 net/ice: add support more PPPoE packeat type for switch
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/ice: add input set byte number check
error: sha1 information is lacking or useless (drivers/net/ice/ice_switch_filter.c).
error: could not build fake ancestor
Patch failed at 0004 net/ice: add input set byte number check
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