From: dpdklab@iol.unh.edu
To: test-report@dpdk.org
Cc: dpdk-test-reports@iol.unh.edu
Subject: |WARNING| pw136641-136644 [PATCH] [v4, 4/4] app/testpmd: add encap hash calculation
Date: Tue, 13 Feb 2024 07:29:13 -0800 (PST) [thread overview]
Message-ID: <65cb8ac9.050a0220.297c4.1308SMTPIN_ADDED_MISSING@mx.google.com> (raw)
Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/136641
_apply patch failure_
Submitter: Ori Kam <orika@nvidia.com>
Date: Tuesday, February 13 2024 14:16:40
Applied on: CommitID:4cf59bbc9edf5419a9f2644a132c9a96c071a4c8
Apply patch set 136641-136644 failed:
Cloning the DPDK mirror at: https://github.com/DPDK/dpdk.git (Attempt 1 of 3)
Trying to checkout branch: main
Checked out to main (31d72ff4dc7c057366153e9918ac92bf9123a3bc)
Done: main commit 31d72ff4dc7c057366153e9918ac92bf9123a3bc
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (4cf59bbc9edf5419a9f2644a132c9a96c071a4c8)
Applying patch...
Failed to apply patch:
Applying: ethdev: introduce encap hash calculation
Using index info to reconstruct a base tree...
M doc/guides/rel_notes/release_24_03.rst
M lib/ethdev/rte_flow.c
M lib/ethdev/rte_flow_driver.h
M lib/ethdev/version.map
Falling back to patching base and 3-way merge...
Auto-merging lib/ethdev/version.map
Auto-merging lib/ethdev/rte_flow_driver.h
Auto-merging lib/ethdev/rte_flow.c
CONFLICT (content): Merge conflict in lib/ethdev/rte_flow.c
Auto-merging doc/guides/rel_notes/release_24_03.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_24_03.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 ethdev: introduce encap hash calculation
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".
Trying to checkout branch: main
Checked out to main (4cf59bbc9edf5419a9f2644a132c9a96c071a4c8)
Applying patch...
Failed to apply patch:
Applying: ethdev: introduce encap hash calculation
Using index info to reconstruct a base tree...
M doc/guides/rel_notes/release_24_03.rst
M lib/ethdev/rte_flow.c
M lib/ethdev/rte_flow_driver.h
M lib/ethdev/version.map
Falling back to patching base and 3-way merge...
Auto-merging lib/ethdev/version.map
Auto-merging lib/ethdev/rte_flow_driver.h
Auto-merging lib/ethdev/rte_flow.c
CONFLICT (content): Merge conflict in lib/ethdev/rte_flow.c
Auto-merging doc/guides/rel_notes/release_24_03.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_24_03.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 ethdev: introduce encap hash calculation
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".
https://lab.dpdk.org/results/dashboard/patchsets/29132/
UNH-IOL DPDK Community Lab
reply other threads:[~2024-02-13 15:29 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=65cb8ac9.050a0220.297c4.1308SMTPIN_ADDED_MISSING@mx.google.com \
--to=dpdklab@iol.unh.edu \
--cc=dpdk-test-reports@iol.unh.edu \
--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).