Test-Label: Intel-dts-suite-test Test-Status: FAILURE http://dpdk.org/patch/108437 Subject: [V1] test_plans/*: modify power test plans to adapt meson build _Apply issues_ Diff: test_plans/vm_pw_mgmt_policy_test_plan.rst test_plans/vm_power_manager_test_plan.rst test_plans/power_telemetry_test_plan.rst test_plans/power_pstate_test_plan.rst test_plans/power_pbf_test_plan.rst test_plans/power_negative_test_plan.rst test_plans/power_empty_poll_test_plan.rst test_plans/power_branch_ratio_test_plan.rst test_plans/power_bidirection_channel_test_plan.rst DPDK: commit 305769000c40a4fdf1ed0cf24c157b447b91ea7d Author: Thomas Monjalon Date: Sun Feb 27 21:52:48 2022 +0100 Comment: version: 22.03-rc2 DTS: commit fb043ef7231bcd8910fa55b072e2900d5cf2b5b5 Author: Weiyuan Li Date: Fri Feb 11 14:26:10 2022 +0800 Comment: test_plans/userspace_ethtool:remove duplicate vlan test case. DTS git baseline: Repo:dts, CommitID: fb043ef7231bcd8910fa55b072e2900d5cf2b5b5 * Repo: dts CONFLICT (content): Merge conflict in test_plans/vm_power_manager_test_plan.rst Auto-merging test_plans/power_negative_test_plan.rst CONFLICT (content): Merge conflict in test_plans/power_negative_test_plan.rst error: Failed to merge in the changes. Patch failed at 0001 test_plans/*: modify power test plans to adapt meson build 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