FAILED: patch "[PATCH] selftests: mptcp: simult flows: skip if MPTCP is not" failed to apply to 6.1-stable tree

The patch below does not apply to the 6.1-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 <[email protected]>.

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.1.y
git checkout FETCH_HEAD
git cherry-pick -x 9161f21c74a1a0e7bb39eb84ea0c86b23c92fc87
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2023060730-morally-unsigned-2b7b@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..

Possible dependencies:

thanks,

greg k-h

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

From 9161f21c74a1a0e7bb39eb84ea0c86b23c92fc87 Mon Sep 17 00:00:00 2001
From: Matthieu Baerts <[email protected]>
Date: Sun, 28 May 2023 19:35:31 +0200
Subject: [PATCH] selftests: mptcp: simult flows: skip if MPTCP is not
supported

Selftests are supposed to run on any kernels, including the old ones not supporting MPTCP.

A new check is then added to make sure MPTCP is supported. If not, the test stops and is marked as "skipped".

index 9f22f7e5027d..36a3c9d92e20 100755
@@ -1,6 +1,8 @@
 #!/bin/bash
 # SPDX-License-Identifier: GPL-2.0
 
+. "$(dirname "${0}")/mptcp_lib.sh"
+
 sec=$(date +%s)
 rndh=$(printf %x $sec)-$(mktemp -u XXXXXX)
 ns1="ns1-$rndh"

@@ -34,6 +36,8 @@ cleanup()
 	done
 }
 
+mptcp_lib_check_mptcp
+
 ip -Version > /dev/null 2>&1
 if [ $? -ne 0 ];then
 	echo "SKIP: Could not run test without ip tool"

commit 9161f21c74a1a0e7bb39eb84ea0c86b23c92fc87 upstream.

Backport note: a simple conflict with 787eb1e4df93 ("selftests: mptcp:
uniform 'rndh' variable") where a new line was added for something else in the same context.

Selftests are supposed to run on any kernels, including the old ones not supporting MPTCP.

A new check is then added to make sure MPTCP is supported. If not, the test stops and is marked as "skipped".

---
 tools/testing/selftests/net/mptcp/simult_flows.sh | 4 ++++
 1 file changed, 4 insertions(+)

index 40aeb5a71a2a..4a417f9d51d6 100755
@@ -1,6 +1,8 @@
 #!/bin/bash
 # SPDX-License-Identifier: GPL-2.0
 
+. "$(dirname "${0}")/mptcp_lib.sh"
+
 rndh=$(printf %x $sec)-$(mktemp -u XXXXXX)
 ns1="ns1-$rndh"
 ns2="ns2-$rndh"

@@ -33,6 +35,8 @@ cleanup()
 	done
 }
 
+mptcp_lib_check_mptcp
+
 ip -Version > /dev/null 2>&1
 if [ $? -ne 0 ];then
 	echo "SKIP: Could not run test without ip tool"

2.39.2