[dpdk-test-report] |FAILURE| pw(73670) [v3, 6/8] net/ice/base: split capability parse into separate functions
sys_stv at intel.com
sys_stv at intel.com
Fri Jul 10 11:54:11 CEST 2020
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/73670
_apply issues_
Submitter: Junfeng Guo <junfeng.guo at intel.com>
Date: 2020-07-10 02:14:10
Reply_mail: 20200710021412.3403562-7-junfeng.guo at intel.com
DPDK git baseline:
Repo:dpdk-next-net-intel, CommitID: 334a11123f97ea5a2d22d71dbd9dc21bef0c950c
Repo:dpdk, CommitID: e0a439466b9d63e3a5cc063efbf08784300b54c4
* Repo: dpdk-next-net-intel
Auto-merging drivers/net/ice/base/ice_common.c
CONFLICT (content): Merge conflict in drivers/net/ice/base/ice_common.c
error: Failed to merge in the changes.
Patch failed at 0005 net/ice/base: add capability list AQ function
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/ice/base/ice_flow.c
CONFLICT (content): Merge conflict in drivers/net/ice/base/ice_flow.c
error: Failed to merge in the changes.
Patch failed at 0001 net/ice/base: fix GTP-U inner RSS IPv4 IPv6 co-exist
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
More information about the test-report
mailing list