Test-Label: Intel-dts-suite-test
Test-Status: FAILURE
http://dpdk.org/patch/117170
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 6de9af249177cee6baceb31e9b73b4df5e34fac7
	Author: Zhichao Zeng <zhichaox.zeng@intel.com>
	Date:   Sat Sep 17 09:49:10 2022 +0800
	Comment: net/ice: support traffic to original DCF port

DTS:
	commit 8071f2b95380dc052114974dce8bddb8fa1edc04
	Author: Song Jiale <songx.jiale@intel.com>
	Date:   Fri Sep 23 14:04:00 2022 +0000
	Comment: tests/iavf_fdir_protocol_agnostic_flow: add test case for ice protocol agnostic flow offloading

DTS git baseline:
	Repo:dts, CommitID: 8071f2b95380dc052114974dce8bddb8fa1edc04



* 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