Test-Label: Intel-dts-suite-test Test-Status: FAILURE http://dpdk.org/patch/104583 Subject: [V2] tests/unit_tests_eal:remove strict timing requirements some tests _Apply issues_ Diff: tests/TestSuite_unit_tests_eal.py test_plans/unit_tests_eal_test_plan.rst DPDK: commit 0c6e27549c03695f85d949f5195a166b449b419c Author: Thomas Monjalon Date: Wed Nov 17 20:19:47 2021 +0100 Comment: version: 21.11-rc3 DTS: commit f78b33713dcf275f9458ef3e0b60c1c60d0c1355 Author: DongJunX Date: Wed Nov 17 17:26:30 2021 +0800 Comment: framework/test_case: removed bind_nic_driver common func to framework DTS git baseline: Repo:dts, CommitID: f78b33713dcf275f9458ef3e0b60c1c60d0c1355 * Repo: dts Auto-merging tests/TestSuite_unit_tests_eal.py CONFLICT (content): Merge conflict in tests/TestSuite_unit_tests_eal.py Auto-merging test_plans/unit_tests_eal_test_plan.rst error: Failed to merge in the changes. Patch failed at 0001 tests/unit_tests_eal:remove strict timing requirements some tests 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