compilation|WARNING| pw(137373) sid(31258) job(PER_PATCH_BUILD12777)[v2] lib/hash: add siphash

sys_stv at intel.com sys_stv at intel.com
Thu Aug 1 09:09:57 CEST 2024


Test-Label: Intel-compilation
Test-Status: WARNING
http://dpdk.org/patch/137373

_apply issues_

Submitter: Stephen Hemminger <stephen at networkplumber.org>
Date: 2024-02-27 19:14:38
Reply_mail: <20240227191437.346593-2-stephen at 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


More information about the test-report mailing list