* [dpdk-test-report] |FAILURE| pw(73669) [v3, 5/8] net/ice/base: add capability list AQ function
@ 2020-07-11 4:45 sys_stv
0 siblings, 0 replies; 2+ messages in thread
From: sys_stv @ 2020-07-11 4:45 UTC (permalink / raw)
To: test-report
[-- Attachment #1: Type: text/plain, Size: 1411 bytes --]
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/73669
_apply issues_
Submitter: Junfeng Guo <junfeng.guo@intel.com>
Date: 2020-07-10 02:14:09
Reply_mail: 20200710021412.3403562-6-junfeng.guo@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
^ permalink raw reply [flat|nested] 2+ messages in thread
* [dpdk-test-report] |FAILURE| pw(73669) [v3, 5/8] net/ice/base: add capability list AQ function
@ 2020-07-10 9:54 sys_stv
0 siblings, 0 replies; 2+ messages in thread
From: sys_stv @ 2020-07-10 9:54 UTC (permalink / raw)
To: test-report
[-- Attachment #1: Type: text/plain, Size: 1411 bytes --]
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/73669
_apply issues_
Submitter: Junfeng Guo <junfeng.guo@intel.com>
Date: 2020-07-10 02:14:09
Reply_mail: 20200710021412.3403562-6-junfeng.guo@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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-07-11 4:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-11 4:45 [dpdk-test-report] |FAILURE| pw(73669) [v3, 5/8] net/ice/base: add capability list AQ function sys_stv
-- strict thread matches above, loose matches on Subject: below --
2020-07-10 9:54 sys_stv
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).