From: sys_stv@intel.com
To: test-report@dpdk.org
Subject: [dpdk-test-report] |FAILURE| pw(82269) [2/2] net/txgbe: add Tx done cleanup
Date: 27 Oct 2020 01:41:21 -0700 [thread overview]
Message-ID: <e30717$ae6nkh@fmsmga004-auth.fm.intel.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 1404 bytes --]
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/82269
_apply issues_
Submitter: Jiawen Wu <jiawenwu@trustnetic.com>
Date: 2020-10-27 06:23:15
Reply_mail: 20201027062315.242576-2-jiawenwu@trustnetic.com
DPDK git baseline:
Repo:dpdk, CommitID: 5d7366372888ba654d3ba02b2b06de469ec433b9
* Repo: dpdk
CONFLICT (modify/delete): drivers/net/txgbe/txgbe_rxtx.c deleted in HEAD and modified in net/txgbe: add Rx and Tx descriptor status. Version net/txgbe: add Rx and Tx descriptor status of drivers/net/txgbe/txgbe_rxtx.c left in tree.
CONFLICT (modify/delete): drivers/net/txgbe/txgbe_ethdev.h deleted in HEAD and modified in net/txgbe: add Rx and Tx descriptor status. Version net/txgbe: add Rx and Tx descriptor status of drivers/net/txgbe/txgbe_ethdev.h left in tree.
CONFLICT (modify/delete): drivers/net/txgbe/txgbe_ethdev.c deleted in HEAD and modified in net/txgbe: add Rx and Tx descriptor status. Version net/txgbe: add Rx and Tx descriptor status of drivers/net/txgbe/txgbe_ethdev.c left in tree.
error: Failed to merge in the changes.
Patch failed at 0001 net/txgbe: add Rx and Tx descriptor status
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:[~2020-10-27 8:41 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='e30717$ae6nkh@fmsmga004-auth.fm.intel.com' \
--to=sys_stv@intel.com \
--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).