From: Sasha Levin Date: Sun, 10 Mar 2024 21:52:55 +0000 (-0400) Subject: Drop selftests-mptcp-simult-flows-fix-some-subtest-names.patch X-Git-Tag: v6.8.1~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ec616ec2dc56bcc6e724a76b0b812e02437b8e6e;p=thirdparty%2Fkernel%2Fstable-queue.git Drop selftests-mptcp-simult-flows-fix-some-subtest-names.patch Signed-off-by: Sasha Levin --- diff --git a/queue-5.15/selftests-mptcp-simult-flows-fix-some-subtest-names.patch b/queue-5.15/selftests-mptcp-simult-flows-fix-some-subtest-names.patch deleted file mode 100644 index f528c956af0..00000000000 --- a/queue-5.15/selftests-mptcp-simult-flows-fix-some-subtest-names.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 19c8b4907ef37163bc6be6633152beb25cb163c5 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 15 Feb 2024 19:25:37 +0100 -Subject: selftests: mptcp: simult flows: fix some subtest names - -From: Matthieu Baerts (NGI0) - -[ Upstream commit 4d8e0dde0403b5a86aa83e243f020711a9c3e31f ] - -The selftest was correctly recording all the results, but the 'reverse -direction' part was missing in the name when needed. - -It is important to have a unique (sub)test name in TAP, because some CI -environments drop tests with duplicated name. - -Fixes: 675d99338e7a ("selftests: mptcp: simult flows: format subtests results in TAP") -Cc: stable@vger.kernel.org -Reviewed-by: Geliang Tang -Signed-off-by: Matthieu Baerts (NGI0) -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - tools/testing/selftests/net/mptcp/simult_flows.sh | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/testing/selftests/net/mptcp/simult_flows.sh -index af5f4ae48f7ea..aef9ce433b374 100755 ---- a/tools/testing/selftests/net/mptcp/simult_flows.sh -+++ b/tools/testing/selftests/net/mptcp/simult_flows.sh -@@ -257,7 +257,8 @@ run_test() - [ $bail -eq 0 ] || exit $ret - fi - -- printf "%-60s" "$msg - reverse direction" -+ msg+=" - reverse direction" -+ printf "%-60s" "${msg}" - do_transfer $large $small $time - lret=$? - mptcp_lib_result_code "${lret}" "${msg}" --- -2.43.0 - diff --git a/queue-5.15/series b/queue-5.15/series index 1914c461d1a..f7474324d99 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -70,7 +70,6 @@ exit-fix-typo-in-comment-s-sub-theads-sub-threads.patch exit-wait_task_zombie-kill-the-no-longer-necessary-s.patch alsa-usb-audio-fix-wrong-kfree-issue-in-snd_usb_endp.patch alsa-usb-audio-always-initialize-fixed_rate-in-snd_u.patch -selftests-mptcp-simult-flows-fix-some-subtest-names.patch alsa-usb-audio-add-fixed_rate-quirk-for-jbl-quantum6.patch alsa-usb-audio-sort-quirk-table-entries.patch regmap-allow-to-define-reg_update_bits-for-no-bus-co.patch diff --git a/queue-6.1/selftests-mptcp-simult-flows-fix-some-subtest-names.patch b/queue-6.1/selftests-mptcp-simult-flows-fix-some-subtest-names.patch deleted file mode 100644 index 58f1540fc0a..00000000000 --- a/queue-6.1/selftests-mptcp-simult-flows-fix-some-subtest-names.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 94a73f9dec7fef0ebc322fac05236c755fb6aa29 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 15 Feb 2024 19:25:37 +0100 -Subject: selftests: mptcp: simult flows: fix some subtest names - -From: Matthieu Baerts (NGI0) - -[ Upstream commit 4d8e0dde0403b5a86aa83e243f020711a9c3e31f ] - -The selftest was correctly recording all the results, but the 'reverse -direction' part was missing in the name when needed. - -It is important to have a unique (sub)test name in TAP, because some CI -environments drop tests with duplicated name. - -Fixes: 675d99338e7a ("selftests: mptcp: simult flows: format subtests results in TAP") -Cc: stable@vger.kernel.org -Reviewed-by: Geliang Tang -Signed-off-by: Matthieu Baerts (NGI0) -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - tools/testing/selftests/net/mptcp/simult_flows.sh | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/testing/selftests/net/mptcp/simult_flows.sh -index 6bda70af03a83..41d2f4991b35c 100755 ---- a/tools/testing/selftests/net/mptcp/simult_flows.sh -+++ b/tools/testing/selftests/net/mptcp/simult_flows.sh -@@ -269,7 +269,8 @@ run_test() - [ $bail -eq 0 ] || exit $ret - fi - -- printf "%-60s" "$msg - reverse direction" -+ msg+=" - reverse direction" -+ printf "%-60s" "${msg}" - do_transfer $large $small $time - lret=$? - mptcp_lib_result_code "${lret}" "${msg}" --- -2.43.0 - diff --git a/queue-6.1/series b/queue-6.1/series index 6aa0f5bb096..c18937e36ea 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -63,6 +63,5 @@ getrusage-use-sig-stats_lock-rather-than-lock_task_s.patch fs-proc-do_task_stat-use-__for_each_thread.patch fs-proc-do_task_stat-use-sig-stats_lock-to-gather-th.patch exit-wait_task_zombie-kill-the-no-longer-necessary-s.patch -selftests-mptcp-simult-flows-fix-some-subtest-names.patch blk-wbt-fix-that-wbt-can-t-be-disabled-by-default.patch blk-iocost-pass-gendisk-to-ioc_refresh_params.patch