Test-Label: Intel-dts-suite-test Test-Status: FAILURE http://dpdk.org/patch/96733 Subject: [v2,3/3] ci/initial: Added script to get the tests for a patchset _Apply issues_ Diff: framework/test_case.py requirements.txt ci/requirements.txt ci/get_tests_for_patchset.py ci/README.txt DPDK: commit 0e4dc6af06228c8504a5538512cb31ed7bf6cc23 Author: Zhihong Wang Date: Tue Dec 14 11:30:16 2021 +0800 Comment: ring: fix overflow in memory size calculation DTS: commit 01d33c36cd9f54db3a50ee2521354292c68b3fda Author: Hailin Xu 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 framework/test_case.py CONFLICT (content): Merge conflict in framework/test_case.py error: Failed to merge in the changes. Patch failed at 0001 framework/test_result: Fix circular import 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