From: sys_stv@intel.com
To: test-report@dpdk.org, dts-test-report@dpdk.org, weix.ling@intel.com
Subject: [dts-test-report] |FAILURE| pw(119602-119603) sid(25651) job(DTS_AUTO_1809) [V1, 2/2] tests/loopback_virtio_user_server_mode_cbdma: modify the dmas parameter
Date: 09 Nov 2022 01:35:09 -0800 [thread overview]
Message-ID: <d46734$n75o7d@fmsmga001-auth.fm.intel.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 1688 bytes --]
Test-Label: Intel-dts-suite-test
Test-Status: FAILURE
http://dpdk.org/patch/119603
Subject: [V1,2/2] tests/loopback_virtio_user_server_mode_cbdma: modify the dmas parameter
_Apply issues_
Diff:
test_plans/loopback_virtio_user_server_mode_cbdma_test_plan.rst
tests/TestSuite_loopback_virtio_user_server_mode_cbdma.py
DPDK:
commit a39f5e14560df310e7af3c135a11bb6f51eb92e6
Author: Rahul Bhansali <rbhansali@marvell.com>
Date: Wed May 25 14:43:27 2022 +0530
Comment: examples/l2fwd: check Rx packets count
DTS:
commit 5b1f1f829daad677af5b513b52e066b7d91e46ed
Author: Lijuan Tu <lijuan.tu@intel.com>
Date: Wed Nov 3 01:27:02 2021 +0800
Comment: version: 21.08.0
DTS git baseline:
Repo:dts, CommitID: 5b1f1f829daad677af5b513b52e066b7d91e46ed
* Repo: dts
A test_plans/loopback_virtio_user_server_mode_cbdma_test_plan.rst
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): test_plans/loopback_virtio_user_server_mode_cbdma_test_plan.rst deleted in HEAD and modified in test_plans/loopback_virtio_user_server_mode_cbdma_test_plan: modify the dmas parameter. Version test_plans/loopback_virtio_user_server_mode_cbdma_test_plan: modify the dmas parameter of test_plans/loopback_virtio_user_server_mode_cbdma_test_plan.rst left in tree.
error: Failed to merge in the changes.
Patch failed at 0001 test_plans/loopback_virtio_user_server_mode_cbdma_test_plan: modify the dmas parameter
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:[~2022-11-09 9:35 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='d46734$n75o7d@fmsmga001-auth.fm.intel.com' \
--to=sys_stv@intel.com \
--cc=dts-test-report@dpdk.org \
--cc=test-report@dpdk.org \
--cc=weix.ling@intel.com \
/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).