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

_apply issues_

Submitter: Simei Su <simei.su@intel.com>
Date: 2020-09-29 01:56:32
Reply_mail: 20200929015632.109364-5-simei.su@intel.com

DPDK git baseline:
	Repo:dpdk-next-net-intel, CommitID: 900d834cf64bc8be63d821a3e6493ba78084e67b
	Repo:dpdk, CommitID: 8e6fa199d1e7ec032a4cbb5e80276cbfad02098e


* Repo: dpdk-next-net-intel
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/ice/ice_dcf_ethdev.c
CONFLICT (content): Merge conflict in drivers/net/ice/ice_dcf_ethdev.c
error: Failed to merge in the changes.
Patch failed at 0004 net/ice: add devarg for ACL ipv4 rule number
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: support ACL filter in DCF
error: sha1 information is lacking or useless (doc/guides/rel_notes/release_20_11.rst).
error: could not build fake ancestor
Patch failed at 0003 net/ice: support ACL filter in DCF
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