From: sys_stv@intel.com
To: test-report@dpdk.org, stephen@networkplumber.org
Subject: compilation|WARNING| pw(137373) sid(31258) job(PER_PATCH_BUILD12777)[v2] lib/hash: add siphash
Date: 01 Aug 2024 00:09:57 -0700 [thread overview]
Message-ID: <b29851$1k9qlc@orviesa010-auth.jf.intel.com> (raw)
[-- 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
reply other threads:[~2024-08-01 7:09 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='b29851$1k9qlc@orviesa010-auth.jf.intel.com' \
--to=sys_stv@intel.com \
--cc=stephen@networkplumber.org \
--cc=test-report@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).