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 c0c305ee9e0e7c9feca6412266a778f330d20c19
	Author: David Marchand <david.marchand@redhat.com>
	Date:   Thu May 5 11:29:52 2022 +0200
	Comment: ci: build some job with ASan

DTS:
	commit e82d3bc030d87966a093852b326f6d675d65cb03
	Author: Jun Dong <junx.dong@intel.com>
	Date:   Tue May 10 17:54:31 2022 +0800
	Comment: tests/*: replace codename in test suites

DTS git baseline:
	Repo:dts, CommitID: e82d3bc030d87966a093852b326f6d675d65cb03



* 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