Test-Label: Intel-dts-suite-test
Test-Status: FAILURE
http://dpdk.org/patch/120798
Subject: [V1,4/4] tests/ice_dcf_switch_filter: update existing negative cases to validate represented port action and port representor action

_Apply issues_

Diff:
	test_plans/ice_dcf_switch_filter_test_plan.rst
	tests/TestSuite_ice_dcf_switch_filter.py

DPDK:
	commit c581c49cd3fcaff596fbe566e270b442e6326c79
	Author: Akhil Goyal <gakhil@marvell.com>
	Date:   Mon Dec 5 13:29:44 2022 +0530
	Comment: maintainers: split baseband from crypto tree

DTS:
	commit 1b4f822bee585e100b0192d6383d01fb95cb7dfa
	Author: Wei Ling <weix.ling@intel.com>
	Date:   Tue Nov 22 15:13:31 2022 +0800
	Comment: tests/virtio_event_idx_interrupt_cbdma: modify the dmas parameter by DPDK changed

DTS git baseline:
	Repo:dts, CommitID: 1b4f822bee585e100b0192d6383d01fb95cb7dfa



* Repo: dts
Falling back to patching base and 3-way merge...
Auto-merging test_plans/ice_dcf_switch_filter_test_plan.rst
CONFLICT (content): Merge conflict in test_plans/ice_dcf_switch_filter_test_plan.rst
error: Failed to merge in the changes.
Patch failed at 0001 test_plans/ice_dcf_switch_filter: update existing TO_VF action cases to cover port representor action from not covered vf original action
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