Test-Label: Intel-dts-suite-test Test-Status: FAILURE http://dpdk.org/patch/121156 Subject: [V1,3/3] tests/vf_offload: implement packets count, super-long packet and random payload. _Apply issues_ Diff: test_plans/vf_offload_test_plan.rst tests/TestSuite_vf_offload.py DPDK: commit c581c49cd3fcaff596fbe566e270b442e6326c79 Author: Akhil Goyal Date: Mon Dec 5 13:29:44 2022 +0530 Comment: maintainers: split baseband from crypto tree DTS: commit 275fc3485c4b172db8e7b96779850f187ba1bb6f Author: Yogesh Jangra Date: Tue Nov 29 06:02:41 2022 +0000 Comment: tests/pipeline: added test case for validate instruction DTS git baseline: Repo:dts, CommitID: 275fc3485c4b172db8e7b96779850f187ba1bb6f * Repo: dts Falling back to patching base and 3-way merge... Auto-merging test_plans/vf_offload_test_plan.rst CONFLICT (content): Merge conflict in test_plans/vf_offload_test_plan.rst error: Failed to merge in the changes. Patch failed at 0001 test_plans/vf_offload: fix wrong example packets. 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