* [dts-test-report] |FAILURE| pw(113581) sid(23849) job(DTS_AUTO_1281) tests/coremask: fix all_core size
@ 2022-06-30 17:41 sys_stv
0 siblings, 0 replies; only message in thread
From: sys_stv @ 2022-06-30 17:41 UTC (permalink / raw)
To: test-report, dts-test-report
[-- 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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-06-30 17:41 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-30 17:41 [dts-test-report] |FAILURE| pw(113581) sid(23849) job(DTS_AUTO_1281) tests/coremask: fix all_core size sys_stv
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).