Hi Greg,
On 22/06/2023 09:57, gregkh@xxxxxxxxxxxxxxxxxxx wrote:
>
> The patch below does not apply to the 5.4-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@xxxxxxxxxxxxxxx>.
>
> To reproduce the conflict and resubmit, you may use the following commands:
(...)
> ------------------ original commit in Linus's tree ------------------
>
> From 2177d0b08e421971e035672b70f3228d9485c650 Mon Sep 17 00:00:00 2001
> From: Matthieu Baerts <matthieu.baerts@xxxxxxxxxxxx>
> Date: Thu, 8 Jun 2023 18:38:49 +0200
> Subject: [PATCH] selftests: mptcp: pm nl: remove hardcoded default limits
>
> Selftests are supposed to run on any kernels, including the old ones not
> supporting all MPTCP features.
>
> One of them is the checks of the default limits returned by the MPTCP
> in-kernel path-manager. The default values have been modified by commit
> 72bcbc46a5c3 ("mptcp: increase default max additional subflows to 2").
> Instead of comparing with hardcoded values, we can get the default one
> and compare with them.
>
> Note that if we expect to have the latest version, we continue to check
> the hardcoded values to avoid unexpected behaviour changes.
>
> Link: https://github.com/multipath-tcp/mptcp_net-next/issues/368
> Fixes: eedbc685321b ("selftests: add PM netlink functional tests")
Thank you for this notification!
I'm not sure why this patch got picked up for v5.4-stable tree because
it is fixing code that is not in v5.4 but introduced in v5.7. The commit
mentioned here above has not been backported in v5.4. That seems to be
confirmed by:
https://kernel.dance/#eedbc685321b
So no need to do anything here.
Cheers,
Matt
--
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
