Test-Label: Intel-dts-suite-test Test-Status: FAILURE http://dpdk.org/patch/116023 Subject: [V1,4/4] tests/ice_iavf_dual_vlan: split test suite _Apply issues_ Diff: test_plans/index.rst test_plans/ice_dcf_dual_vlan_test_plan.rst test_plans/ice_iavf_dual_vlan_test_plan.rst tests/TestSuite_ice_dcf_dual_vlan.py tests/TestSuite_ice_iavf_dual_vlan.py DPDK: commit 4aee6110bb10b0225fa9562f2e48af233a9058a1 Author: Huichao Cai Date: Mon Aug 8 09:48:12 2022 +0800 Comment: ip_frag: add IPv4 fragment copy DTS: commit cb9dc5111879d03c6deef40db17c4b44fd49f5a9 Author: Wei Ling Date: Tue Aug 2 04:23:14 2022 -0400 Comment: tests/virtio_event_idx_interrupt_cbdma: modify testsuite to test virtio dequeue DTS git baseline: Repo:dts, CommitID: cb9dc5111879d03c6deef40db17c4b44fd49f5a9 * Repo: dts Auto-merging test_plans/index.rst Auto-merging test_plans/ice_dcf_dual_vlan_test_plan.rst CONFLICT (content): Merge conflict in test_plans/ice_dcf_dual_vlan_test_plan.rst error: Failed to merge in the changes. Patch failed at 0001 test_plans/ice_dcf_dual_vlan: split test suite 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