Test-Label: Intel-suite-dts-test
Test-Status: FAILURE
http://dpdk.org/patch/99993
Subject: [V1,4/4] tests/generic_flow_api: move case from generic_filter to generic_flow_api

_Apply issues_

Diff:
	test_plans/generic_flow_api_test_plan.rst
	tests/TestSuite_generic_filter.py
	test_plans/generic_filter_test_plan.rst
	tests/TestSuite_generic_flow_api.py

DPDK:
	commit 270470ee903a7ed56e2276e50ced21ef90c675a8
	Author: Tejasree Kondoj <ktejasree@marvell.com>
	Date:   Tue Sep 28 17:37:41 2021 +0530
	Comment: test/crypto: add tunnel header verification cases

DTS:
	commit b850cad7d2713601488cb123c0af0081369dfd9d
	Author: Zhimin Huang <zhiminx.huang@intel.com>
	Date:   Fri Aug 6 02:23:14 2021 +0800
	Comment: tests/cvl_advanced_rss_pppoe:remove destroy rule test steps

DTS git baseline:
	Repo:dts, CommitID: b850cad7d2713601488cb123c0af0081369dfd9d



* Repo: dts
Falling back to patching base and 3-way merge...
Auto-merging test_plans/generic_filter_test_plan.rst
CONFLICT (content): Merge conflict in test_plans/generic_filter_test_plan.rst
error: Failed to merge in the changes.
Patch failed at 0001 test_plans/generic_filter_test_plan: move case from generic_filter to generic_flow_api
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