* compilation|WARNING| pw(137373) sid(31258) job(PER_PATCH_BUILD12777)[v2] lib/hash: add siphash
@ 2024-08-01 7:09 sys_stv
0 siblings, 0 replies; only message in thread
From: sys_stv @ 2024-08-01 7:09 UTC (permalink / raw)
To: test-report, stephen
[-- Attachment #1: Type: text/plain, Size: 838 bytes --]
Test-Label: Intel-compilation
Test-Status: WARNING
http://dpdk.org/patch/137373
_apply issues_
Submitter: Stephen Hemminger <stephen@networkplumber.org>
Date: 2024-02-27 19:14:38
Reply_mail: <20240227191437.346593-2-stephen@networkplumber.org>
DPDK git baseline:
Repo:dpdk, CommitID: b3485f4293997d35b6daecc3437bb0c183a51fb3
* Repo: dpdk
Falling back to patching base and 3-way merge...
Auto-merging lib/hash/version.map
CONFLICT (content): Merge conflict in lib/hash/version.map
error: Failed to merge in the changes.
Patch failed at 0001 lib/hash: add siphash
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:[~2024-08-01 7:09 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-08-01 7:09 compilation|WARNING| pw(137373) sid(31258) job(PER_PATCH_BUILD12777)[v2] lib/hash: add siphash 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).