From: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
To: mptcp@lists.linux.dev, stable@vger.kernel.org,
gregkh@linuxfoundation.org
Cc: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>, sashal@kernel.org
Subject: [PATCH 6.12.y v2 0/3] mptcp: fix recent failed backports (20260919)
Date: Sun, 20 Sep 2026 11:41:36 +0200 [thread overview]
Message-ID: <20260920094135.2431797-5-matttbe@kernel.org> (raw)
The following patches could not be applied without conflicts in this
tree:
- 2b0f561f21b2 ("mptcp: avoid unneeded actions on subflow reset")
- 42064de57fb8 ("mptcp: close race between scheduler and state change")
- f3ef03357396 ("mptcp: fix bad accounting in __mptcp_subflow_push_pending()")
Conflicts (if any) have been resolved, and documented in each patch.
v2: Drop these two patches that have been already backported to this
version, but git didn't complain about that. Instead, resolve a
small conflict in patch 1 ("mptcp: avoid unneeded actions on subflow
reset"): decrement the '__unused' variable.
Paolo Abeni (3):
mptcp: avoid unneeded actions on subflow reset
mptcp: close race between scheduler and state change
mptcp: fix bad accounting in __mptcp_subflow_push_pending()
net/mptcp/protocol.c | 13 ++++++++-----
net/mptcp/protocol.h | 3 ++-
net/mptcp/subflow.c | 11 +++++++++++
3 files changed, 21 insertions(+), 6 deletions(-)
--
2.55.0
next reply other threads:[~2026-09-20 9:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-20 9:41 Matthieu Baerts (NGI0) [this message]
2026-09-20 9:41 ` [PATCH 6.12.y v2 1/3] mptcp: avoid unneeded actions on subflow reset Matthieu Baerts (NGI0)
2026-09-20 9:41 ` [PATCH 6.12.y v2 2/3] mptcp: close race between scheduler and state change Matthieu Baerts (NGI0)
2026-09-20 9:41 ` [PATCH 6.12.y v2 3/3] mptcp: fix bad accounting in __mptcp_subflow_push_pending() Matthieu Baerts (NGI0)
2026-09-20 13:19 ` [PATCH 6.12.y v2 0/3] mptcp: fix recent failed backports (20260919) Greg KH
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=20260920094135.2431797-5-matttbe@kernel.org \
--to=matttbe@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=mptcp@lists.linux.dev \
--cc=sashal@kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.