Test-Label: Intel-dts-suite-test
Test-Status: FAILURE
http://dpdk.org/patch/119603
Subject: [V1,2/2] tests/loopback_virtio_user_server_mode_cbdma: modify the dmas parameter

_Apply issues_

Diff:
	test_plans/loopback_virtio_user_server_mode_cbdma_test_plan.rst
	tests/TestSuite_loopback_virtio_user_server_mode_cbdma.py

DPDK:
	commit a39f5e14560df310e7af3c135a11bb6f51eb92e6
	Author: Rahul Bhansali <rbhansali@marvell.com>
	Date:   Wed May 25 14:43:27 2022 +0530
	Comment: examples/l2fwd: check Rx packets count

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
A	test_plans/loopback_virtio_user_server_mode_cbdma_test_plan.rst
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): test_plans/loopback_virtio_user_server_mode_cbdma_test_plan.rst deleted in HEAD and modified in test_plans/loopback_virtio_user_server_mode_cbdma_test_plan: modify the dmas parameter. Version test_plans/loopback_virtio_user_server_mode_cbdma_test_plan: modify the dmas parameter of test_plans/loopback_virtio_user_server_mode_cbdma_test_plan.rst left in tree.
error: Failed to merge in the changes.
Patch failed at 0001 test_plans/loopback_virtio_user_server_mode_cbdma_test_plan: modify the dmas parameter
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