[dts-test-report] |FAILURE| pw(109919-109920) sid(22575) job(DTS_AUTO_773) [V1, 2/2] tests/vdev_primary_secondary: add hotplug testcase2

[dts-test-report] |FAILURE| pw(109919-109920) sid(22575) job(DTS_AUTO_773) [V1, 2/2] tests/vdev_primary_secondary: add hotplug testcase2

[sys_stv]

[-- Attachment #1: Type: text/plain, Size: 1343 bytes --]

Test-Label: Intel-dts-suite-test
Test-Status: FAILURE
http://dpdk.org/patch/109919
Subject: [V1,2/2] tests/vdev_primary_secondary: add hotplug testcase2

_Apply issues_

Diff:
	test_plans/vdev_primary_secondary_test_plan.rst
	tests/TestSuite_vdev_primary_secondary.py

DPDK:
	commit 76076342ec8ef108a155938d46a88bb493fae60e
	Author: Mattias Rönnblom <mattias.ronnblom@ericsson.com>
	Date:   Mon Apr 11 17:15:58 2022 +0200
	Comment: eal: emit warning for unused trylock return value

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
Falling back to patching base and 3-way merge...
Auto-merging test_plans/vdev_primary_secondary_test_plan.rst
CONFLICT (content): Merge conflict in test_plans/vdev_primary_secondary_test_plan.rst
error: Failed to merge in the changes.
Patch failed at 0001 test_plans/vdev_primary_secondary_test_plan: modify testplan with new format
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