From: dpdklab@iol.unh.edu
To: test-report@dpdk.org
Cc: dpdk-test-reports@iol.unh.edu
Subject: |WARNING| pw137108 [PATCH] [v2] net/cnxk: support Tx queue descriptor count
Date: Fri, 23 Feb 2024 13:09:49 -0800 (PST) [thread overview]
Message-ID: <65d9099d.050a0220.60b05.f0a2SMTPIN_ADDED_MISSING@mx.google.com> (raw)
Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/137108
_apply patch failure_
Submitter: Satha Koteswara Rao Kottidi <skoteshwar@marvell.com>
Date: Friday, February 23 2024 15:33:57
Applied on: CommitID:e9c81b801b647b1e06bb9f0e6da99b49b28b5162
Apply patch set 137108 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 (92c0ad70caf3ed6f4b93de6ddaf7bc369737c049)
Done: main commit 92c0ad70caf3ed6f4b93de6ddaf7bc369737c049
Trying to checkout branch: origin/next-net-mrvl-for-main
Checked out to next-net-mrvl-for-main (e9c81b801b647b1e06bb9f0e6da99b49b28b5162)
Applying patch...
Failed to apply patch:
Applying: net/cnxk: support Tx queue descriptor count
Using index info to reconstruct a base tree...
M doc/guides/rel_notes/release_24_03.rst
M drivers/net/cnxk/cnxk_ethdev.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/cnxk/cnxk_ethdev.h
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 net/cnxk: support Tx queue descriptor count
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 (e9c81b801b647b1e06bb9f0e6da99b49b28b5162)
Applying patch...
Failed to apply patch:
Applying: net/cnxk: support Tx queue descriptor count
Using index info to reconstruct a base tree...
M doc/guides/rel_notes/release_24_03.rst
M drivers/net/cnxk/cnxk_ethdev.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/cnxk/cnxk_ethdev.h
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 net/cnxk: support Tx queue descriptor count
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/29247/
UNH-IOL DPDK Community Lab
next reply other threads:[~2024-02-23 21:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-23 21:09 dpdklab [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-02-23 20:51 dpdklab
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=65d9099d.050a0220.60b05.f0a2SMTPIN_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).