On Mon, Oct 26, 2020 at 09:20:47AM +0100, Matthieu Baerts wrote:

Hi Sasha,

On 26/10/2020 06:18, Sasha Levin wrote:

...

This is a note to let you know that I've just added the patch titled

selftests: mptcp: depends on built-in IPv6

Thank you for backporting this patch.

(...)

...

Fixes: 010b430d5df5 ("mptcp: MPTCP_IPV6 should depend on IPV6 instead of selecting it")

This patch is not really needed because AFAICS this commit here above has not been backported to v5.9. It is only in v5.10-rc1.

(...)

...

diff --git a/tools/testing/selftests/net/mptcp/config b/tools/testing/selftests/net/mptcp/config index 8df5cb8f71ff9..741a1c4f4ae8f 100644 --- a/tools/testing/selftests/net/mptcp/config +++ b/tools/testing/selftests/net/mptcp/config @@ -1,4 +1,5 @@ CONFIG_MPTCP=y +CONFIG_IPV6=y CONFIG_MPTCP_IPV6=y

But you can also keep this patch, it doesn't hurt: without this commit 010b430d5df5 ("mptcp: MPTCP_IPV6 should depend on IPV6 instead of selecting it"), CONFIG_MPTCP_IPV6=y selects CONFIG_IPV6=y. In other words, adding "CONFIG_IPV6=y" here in the selftests config is redundant if you don't have this commit 010b430d5df5 but not wrong.

Note that if you also want to backport this commit 010b430d5df5 ("mptcp: MPTCP_IPV6 should depend on IPV6 instead of selecting it"), you will need commit 0ed37ac586c0 ("mptcp: depends on IPV6 but not as a module") as well.

I'll drop the selftests fix then, thanks for the heads-up!