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 0/4] mptcp: fix recent failed backports (20260521)
Date: Thu, 21 May 2026 05:08:46 +0200 [thread overview]
Message-ID: <20260521030845.723267-6-matttbe@kernel.org> (raw)
The following patches could not be applied without conflicts in this
tree:
- fcf04b143346 ("mptcp: sync the msk->sndbuf at accept() time")
- 03f324f3f1f7 ("mptcp: pm: ADD_ADDR rtx: allow ID 0")
- 9634cb35af17 ("mptcp: pm: ADD_ADDR rtx: always decrease sk refcount")
- b7b9a4615697 ("mptcp: pm: ADD_ADDR rtx: free sk if last")
Conflicts have been resolved, and documented in each patch.
Gang Yan (1):
mptcp: sync the msk->sndbuf at accept() time
Matthieu Baerts (NGI0) (3):
mptcp: pm: ADD_ADDR rtx: allow ID 0
mptcp: pm: ADD_ADDR rtx: always decrease sk refcount
mptcp: pm: ADD_ADDR rtx: free sk if last
net/mptcp/pm_netlink.c | 35 ++++++++++++++++++-----------------
net/mptcp/protocol.c | 3 ++-
2 files changed, 20 insertions(+), 18 deletions(-)
--
2.53.0
next reply other threads:[~2026-05-21 3:10 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-21 3:08 Matthieu Baerts (NGI0) [this message]
2026-05-21 3:08 ` [PATCH 6.12.y 1/4] mptcp: sync the msk->sndbuf at accept() time Matthieu Baerts (NGI0)
2026-05-21 3:08 ` [PATCH 6.12.y 2/4] mptcp: pm: ADD_ADDR rtx: allow ID 0 Matthieu Baerts (NGI0)
2026-05-21 3:08 ` [PATCH 6.12.y 3/4] mptcp: pm: ADD_ADDR rtx: always decrease sk refcount Matthieu Baerts (NGI0)
2026-05-21 3:08 ` [PATCH 6.12.y 4/4] mptcp: pm: ADD_ADDR rtx: free sk if last Matthieu Baerts (NGI0)
2026-05-24 12:09 ` [PATCH 6.12.y 0/4] mptcp: fix recent failed backports (20260521) 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=20260521030845.723267-6-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.