Linux kernel -stable discussions
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: Matthieu Baerts <matttbe@kernel.org>
Cc: stable@vger.kernel.org, Paolo Abeni <pabeni@redhat.com>,
	Jakub Kicinski <kuba@kernel.org>
Subject: Re: [PATCH 6.6.y 2/2] mptcp: prevent race between disconnect() and rtx
Date: Mon, 5 Oct 2026 12:28:35 -0400	[thread overview]
Message-ID: <asPQM7yBMxN3K6Jg@laps> (raw)
In-Reply-To: <83ad680c-9f5e-4328-b87f-ad0f14de9ed6@kernel.org>

On Mon, Oct 05, 2026 at 06:23:00PM +0200, Matthieu Baerts wrote:
>On 17/09/2026 14:49, Sasha Levin wrote:
>> +	msk->timer_ival = icsk->icsk_rto_min;
>
>Because commit ea4eb2adb0d3 ("mptcp: honour configured min/max RTO in
>retransmit paths") is not in this version, this line should be adapted to:
>
>  msk->timer_ival = TCP_RTO_MIN;
>
>(Before commit ea4eb2adb0d3, icsk->icsk_rto_min is not initialised)
>
>Just to avoid a deadlock, do you plan to send a v2 for that, or do you
>prefer someone else doing so?

I can fix it up and queue it.

>I can send a patch to fix v6.18 and v7.2. The patch has been dropped
>from the v6.12 queue. I can send a fixed version for that one too.
>
>Also, a more general question, when you resolve these conflicts, do you
>expect an explicit Acked-by? I tend not to send them on backports, I
>only react when I think something is wrong, but maybe that's not what
>the stable team is expecting?

An explicit ack helps, but not necessary (since most people don't bother :) ).
I am letting these backports sit on the mailing list for at least a day, and
then pull them in if no one complained.

-- 
Thanks,
Sasha

  reply	other threads:[~2026-10-05 16:28 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-09-16 16:34 FAILED: patch "[PATCH] mptcp: prevent race between disconnect() and rtx" failed to apply to 6.6-stable tree gregkh
2026-09-17 12:49 ` [PATCH 6.6.y 1/2] tcp: introduce icsk->icsk_keepalive_timer Sasha Levin
2026-09-17 12:49   ` [PATCH 6.6.y 2/2] mptcp: prevent race between disconnect() and rtx Sasha Levin
2026-10-05 16:23     ` Matthieu Baerts
2026-10-05 16:28       ` Sasha Levin [this message]
2026-10-05 16:35         ` Matthieu Baerts
2026-10-07 21:03           ` Sasha Levin
2026-10-06 21:35       ` Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=asPQM7yBMxN3K6Jg@laps \
    --to=sashal@kernel.org \
    --cc=kuba@kernel.org \
    --cc=matttbe@kernel.org \
    --cc=pabeni@redhat.com \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox