FAILED: patch "[PATCH] selftests: mptcp: fix error path" failed to apply to 6.6-stable tree

FAILED: patch "[PATCH] selftests: mptcp: fix error path" failed to apply to 6.6-stable tree

[gregkh]

The patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.

To reproduce the conflict and resubmit, you may use the following commands:

git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 4a2f48992ddf4b8c2fba846c6754089edae6db5a
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2024080739-imperial-modular-7da5@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..

Possible dependencies:

4a2f48992ddf ("selftests: mptcp: fix error path")
571d79664a4a ("selftests: mptcp: join: update endpoint ops")
0d16ed0c2e74 ("selftests: mptcp: add {get,format}_endpoint(s) helpers")
3188309c8ceb ("selftests: mptcp: netlink: add 'limits' helpers")
29aa32fee7d0 ("selftests: mptcp: export ip_mptcp to mptcp_lib")
40061817d95b ("selftests: mptcp: join: fix dev in check_endpoint")
7f0782ca1ce9 ("selftests: mptcp: add mptcp_lib_verify_listener_events")
8ebb44196585 ("selftests: mptcp: print_test out of verify_listener_events")
663260e14668 ("selftests: mptcp: extract mptcp_lib_check_expected")
339c225e2e03 ("selftests: mptcp: call test_fail without argument")
747ba8783a33 ("selftests: mptcp: print test results with colors")
e7c42bf4d320 ("selftests: mptcp: use += operator to append strings")
aa7694766f14 ("selftests: mptcp: print test results with counters")
3382bb09701b ("selftests: mptcp: add print_title in mptcp_lib")
9e6a39ecb9a1 ("selftests: mptcp: export TEST_COUNTER variable")
fd959262c1bb ("selftests: mptcp: sockopt: print every test result")
c9161a0f8ff9 ("selftests: mptcp: connect: fix misaligned output")
01ed9838107f ("selftests: mptcp: connect: add dedicated port counter")
6215df11b945 ("selftests: mptcp: print all error messages to stdout")
2aebd3579d90 ("selftests: mptcp: simult flows: fix shellcheck warnings")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 4a2f48992ddf4b8c2fba846c6754089edae6db5a Mon Sep 17 00:00:00 2001
From: Paolo Abeni <pabeni@redhat.com>
Date: Sat, 27 Jul 2024 11:04:02 +0200
Subject: [PATCH] selftests: mptcp: fix error path

pm_nl_check_endpoint() currently calls an not existing helper
to mark the test as failed. Fix the wrong call.

Fixes: 03668c65d153 ("selftests: mptcp: join: rework detailed report")
Cc: stable@vger.kernel.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 9c091fc267c4..55d84a1bde15 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -661,7 +661,7 @@ pm_nl_check_endpoint()
 	done
 
 	if [ -z "${id}" ]; then
-		test_fail "bad test - missing endpoint id"
+		fail_test "bad test - missing endpoint id"
 		return
 	fi
 

[PATCH 6.6.y] selftests: mptcp: fix error path

[Matthieu Baerts (NGI0)]

From: Paolo Abeni <pabeni@redhat.com>

commit 4a2f48992ddf4b8c2fba846c6754089edae6db5a upstream.

pm_nl_check_endpoint() currently calls an not existing helper
to mark the test as failed. Fix the wrong call.

Fixes: 03668c65d153 ("selftests: mptcp: join: rework detailed report")
Cc: stable@vger.kernel.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
[ Conflicts in mptcp_join.sh because the context has changed in commit
  571d79664a4a ("selftests: mptcp: join: update endpoint ops") which is
  not in this version. This commit is unrelated to this modification. ]
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
 tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index a2dae2a3a93e..d7973b1202d9 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -812,7 +812,7 @@ pm_nl_check_endpoint()
 	done
 
 	if [ -z "$id" ]; then
-		test_fail "bad test - missing endpoint id"
+		fail_test "bad test - missing endpoint id"
 		return
 	fi
 
-- 
2.45.2