* [dpdk-test-report] |FAILURE| pw(82524) [v3, 21/21] net/ice/base: update version
@ 2020-10-30 5:14 sys_stv
0 siblings, 0 replies; only message in thread
From: sys_stv @ 2020-10-30 5:14 UTC (permalink / raw)
To: test-report
[-- Attachment #1: Type: text/plain, Size: 1444 bytes --]
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/82524
_apply issues_
Submitter: Qi Zhang <qi.z.zhang@intel.com>
Date: 2020-10-28 03:23:20
Reply_mail: 20201028032320.1755208-22-qi.z.zhang@intel.com
DPDK git baseline:
Repo:dpdk-next-net-intel, CommitID: 8463f16f00737799f43a15bc55f795893e5a27a6
Repo:dpdk, CommitID: f4d2ad3aa9898d3cf1d3039ea18cf63c5ef5753e
* Repo: dpdk-next-net-intel
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/ice/ice_ethdev.c
CONFLICT (content): Merge conflict in drivers/net/ice/ice_ethdev.c
error: Failed to merge in the changes.
Patch failed at 0019 net/ice/base: refactor RSS configure API
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/base: refactor RSS configure API
error: sha1 information is lacking or useless (drivers/net/ice/base/ice_flow.c).
error: could not build fake ancestor
Patch failed at 0019 net/ice/base: refactor RSS configure API
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] only message in thread
only message in thread, other threads:[~2020-10-30 5:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-30 5:14 [dpdk-test-report] |FAILURE| pw(82524) [v3, 21/21] net/ice/base: update version 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).