Test-Label: Intel-dts-suite-test
Test-Status: FAILURE
http://dpdk.org/patch/106977
Subject: [V4] test_plans/dcf_lifecycle_test_plan: add test plan for CVL DCF enable device reset API

_Apply issues_

Diff:
	test_plans/dcf_lifecycle_test_plan.rst

DPDK:
	commit 0e4dc6af06228c8504a5538512cb31ed7bf6cc23
	Author: Zhihong Wang <wangzhihong.wzh@bytedance.com>
	Date:   Tue Dec 14 11:30:16 2021 +0800
	Comment: ring: fix overflow in memory size calculation

DTS:
	commit 01d33c36cd9f54db3a50ee2521354292c68b3fda
	Author: Hailin Xu <hailinx.xu@intel.com>
	Date:   Mon Jan 17 23:41:04 2022 +0800
	Comment: tests/cvl_flow_priority: add pf flow priority cases

DTS git baseline:
	Repo:dts, CommitID: 01d33c36cd9f54db3a50ee2521354292c68b3fda



* Repo: dts
Falling back to patching base and 3-way merge...
Auto-merging test_plans/dcf_lifecycle_test_plan.rst
CONFLICT (content): Merge conflict in test_plans/dcf_lifecycle_test_plan.rst
error: Failed to merge in the changes.
Patch failed at 0001 test_plans/dcf_lifecycle_test_plan: add test plan for CVL DCF enable device reset 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