Test-Label: Intel-dts-suite-test
Test-Status: FAILURE
http://dpdk.org/patch/102733
Subject: [V1,3/3] tests/generic_flow_api: add case:test_fdir_for_match_report

_Apply issues_

Diff:
	test_plans/fdir_test_plan.rst
	test_plans/generic_flow_api_test_plan.rst
	tests/TestSuite_generic_flow_api.py
	conf/test_case_supportlist.json

DPDK:
	commit 452c1916b0dbb414a28dff89c995253da1c23c0b
	Author: Kevin Laatz <kevin.laatz@intel.com>
	Date:   Tue Oct 26 14:20:45 2021 +0000
	Comment: dma/idxd: fix truncated error code in status check

DTS:
	commit bf4f2a0643bceea4442ca552456265f661e58968
	Author: Zou Ping <pingx.zou@intel.com>
	Date:   Wed Oct 27 19:58:14 2021 +0800
	Comment: test_plans/cvl_switch_filter_pppoe: change ppp port to bytes type

DTS git baseline:
	Repo:dts, CommitID: bf4f2a0643bceea4442ca552456265f661e58968



* Repo: dts
Falling back to patching base and 3-way merge...
Auto-merging tests/TestSuite_generic_flow_api.py
CONFLICT (content): Merge conflict in tests/TestSuite_generic_flow_api.py
error: Failed to merge in the changes.
Patch failed at 0003 tests/generic_flow_api: add case:test_fdir_for_match_report
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