* [dts-test-report] |FAILURE| pw(113133) sid(23643) job(DTS_AUTO_1226) update release note for 22.03
@ 2022-06-21 6:42 sys_stv
0 siblings, 0 replies; only message in thread
From: sys_stv @ 2022-06-21 6:42 UTC (permalink / raw)
To: test-report, dts-test-report
[-- Attachment #1: Type: text/plain, Size: 1379 bytes --]
Test-Label: Intel-dts-suite-test
Test-Status: FAILURE
http://dpdk.org/patch/113133
Subject: update release note for 22.03
_Apply issues_
Diff:
doc/dts_gsg/rel_notes/release_22_03.rst
DPDK:
commit a1b2afe431d80ab65b2ed9889a61ead335e53299
Author: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
Date: Thu Jun 16 15:16:45 2022 +0100
Comment: pipeline: rework optimization pattern for header generation
DTS:
commit f848615ed7c96c700ad11eadc328513754418ddb
Author: Jiale Song <songx.jiale@intel.com>
Date: Wed May 25 19:21:43 2022 +0800
Comment: tests/ice_dcf_date_path: turn off promisc mode
DTS git baseline:
Repo:dts, CommitID: f848615ed7c96c700ad11eadc328513754418ddb
* Repo: dts
A doc/dts_gsg/rel_notes/release_22_03.rst
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): doc/dts_gsg/rel_notes/release_22_03.rst deleted in HEAD and modified in update release note for 22.03. Version update release note for 22.03 of doc/dts_gsg/rel_notes/release_22_03.rst left in tree.
error: Failed to merge in the changes.
Patch failed at 0001 update release note for 22.03
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-21 6:42 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-21 6:42 [dts-test-report] |FAILURE| pw(113133) sid(23643) job(DTS_AUTO_1226) update release note for 22.03 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).