From: sys_stv@intel.com
To: test-report@dpdk.org, dts-test-report@dpdk.org
Subject: [dts-test-report] |FAILURE| pw(113581) sid(23849) job(DTS_AUTO_1281) tests/coremask: fix all_core size
Date: 30 Jun 2022 10:41:17 -0700 [thread overview]
Message-ID: <8b0460$iitb3b@orsmga001-auth.jf.intel.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 1162 bytes --]
Test-Label: Intel-dts-suite-test
Test-Status: FAILURE
http://dpdk.org/patch/113581
Subject: tests/coremask: fix all_core size
_Apply issues_
Diff:
tests/TestSuite_coremask.py
DPDK:
commit 7cac53f205ebd04d8ebd3ee6a9dd84f698d4ada3
Author: Thomas Monjalon <thomas@monjalon.net>
Date: Mon Jun 27 04:03:44 2022 +0200
Comment: version: 22.07-rc2
DTS:
commit a9a4d3cb38e6ec8ecf06d466bc0dd5f588506f7d
Author: Wei Ling <weix.ling@intel.com>
Date: Fri Jun 24 01:32:14 2022 -0400
Comment: tests/dpdk_gso_lib: modify dpdk code by dpdk change
DTS git baseline:
Repo:dts, CommitID: a9a4d3cb38e6ec8ecf06d466bc0dd5f588506f7d
* Repo: dts
Falling back to patching base and 3-way merge...
Auto-merging tests/TestSuite_coremask.py
CONFLICT (content): Merge conflict in tests/TestSuite_coremask.py
error: Failed to merge in the changes.
Patch failed at 0001 tests/coremask: fix all_core size
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-06-30 17: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='8b0460$iitb3b@orsmga001-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).