From: sys_stv@intel.com
To: test-report@dpdk.org, dts-test-report@dpdk.org
Subject: [dpdk-test-report] [dts-test-report] |FAILURE| pw(99990-99993) sid(19262) job(DTS_AUTO726) [V1, 4/4] tests/generic_flow_api: move case from generic_filter to generic_flow_api
Date: 29 Sep 2021 05:00:00 -0700 [thread overview]
Message-ID: <f5489b$e6h74e@orsmga007-auth.jf.intel.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 1462 bytes --]
Test-Label: Intel-suite-dts-test
Test-Status: FAILURE
http://dpdk.org/patch/99993
Subject: [V1,4/4] tests/generic_flow_api: move case from generic_filter to generic_flow_api
_Apply issues_
Diff:
test_plans/generic_flow_api_test_plan.rst
tests/TestSuite_generic_filter.py
test_plans/generic_filter_test_plan.rst
tests/TestSuite_generic_flow_api.py
DPDK:
commit 270470ee903a7ed56e2276e50ced21ef90c675a8
Author: Tejasree Kondoj <ktejasree@marvell.com>
Date: Tue Sep 28 17:37:41 2021 +0530
Comment: test/crypto: add tunnel header verification cases
DTS:
commit b850cad7d2713601488cb123c0af0081369dfd9d
Author: Zhimin Huang <zhiminx.huang@intel.com>
Date: Fri Aug 6 02:23:14 2021 +0800
Comment: tests/cvl_advanced_rss_pppoe:remove destroy rule test steps
DTS git baseline:
Repo:dts, CommitID: b850cad7d2713601488cb123c0af0081369dfd9d
* Repo: dts
Falling back to patching base and 3-way merge...
Auto-merging test_plans/generic_filter_test_plan.rst
CONFLICT (content): Merge conflict in test_plans/generic_filter_test_plan.rst
error: Failed to merge in the changes.
Patch failed at 0001 test_plans/generic_filter_test_plan: move case from generic_filter to generic_flow_api
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:[~2021-09-29 12:00 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='f5489b$e6h74e@orsmga007-auth.jf.intel.com' \
--to=sys_stv@intel.com \
--cc=dts-test-report@dpdk.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).