This is a note to let you know that I've just added the patch titled
[PATCH stable 5.9 28/30] mptcp: MPTCP_KUNIT_TESTS should depend on MPTCP instead of selecting it
to the 5.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mptcp-mptcp_kunit_tests-should-depend-on-mptcp-instead-of-selecting-it.patch
and it can be found in the queue-5.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Sat Oct 24 10:56:06 AM CEST 2020
From: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Date: Mon, 19 Oct 2020 13:32:40 +0200
Subject: [PATCH stable 5.9 28/30] mptcp: MPTCP_KUNIT_TESTS should depend on MPTCP instead of selecting it
From: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
[ Upstream commit b142083b585c2c03af24cca4d274f797796a4064 ]
MPTCP_KUNIT_TESTS selects MPTCP, thus enabling an optional feature the
user may not want to enable. Fix this by making the test depend on
MPTCP instead.
Fixes: a00a582203dbc43e ("mptcp: move crypto test to KUNIT")
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Reviewed-by: Matthieu Baerts <matthieu.baerts@xxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20201019113240.11516-1-geert@xxxxxxxxxxxxxx
Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/mptcp/Kconfig | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
--- a/net/mptcp/Kconfig
+++ b/net/mptcp/Kconfig
@@ -22,11 +22,8 @@ config MPTCP_IPV6
select IPV6
default y
-endif
-
config MPTCP_KUNIT_TESTS
tristate "This builds the MPTCP KUnit tests" if !KUNIT_ALL_TESTS
- select MPTCP
depends on KUNIT
default KUNIT_ALL_TESTS
help
@@ -39,3 +36,4 @@ config MPTCP_KUNIT_TESTS
If unsure, say N.
+endif
Patches currently in stable-queue which might be from geert@xxxxxxxxxxxxxx are
queue-5.9/mptcp-mptcp_kunit_tests-should-depend-on-mptcp-instead-of-selecting-it.patch
