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 5.15.y 0/2] mptcp: fix recent failed backports (20251016)
Date: Fri, 17 Oct 2025 16:39:50 +0200 [thread overview]
Message-ID: <20251017143949.2844546-4-matttbe@kernel.org> (raw)
In-Reply-To: <2025101658-underwire-colonize-b998@gregkh>
Greg recently reported the following patch could not be applied without
conflicts in this tree:
- 4b1ff850e0c1 ("mptcp: pm: in-kernel: usable client side with C-flag")
Note that the following patch got applied, but at the wrong place and
requiring additional modifications:
- 008385efd05e ("selftests: mptcp: join: validate C-flag + def limit")
Conflicts have been resolved, and documented in each patch.
Matthieu Baerts (NGI0) (2):
mptcp: pm: in-kernel: usable client side with C-flag
selftests: mptcp: join: validate C-flag + def limit
net/mptcp/pm.c | 7 ++-
net/mptcp/pm_netlink.c | 49 ++++++++++++++++++-
net/mptcp/protocol.h | 8 +++
.../testing/selftests/net/mptcp/mptcp_join.sh | 10 ++++
4 files changed, 71 insertions(+), 3 deletions(-)
--
2.51.0
next prev parent reply other threads:[~2025-10-17 14:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-16 13:19 FAILED: patch "[PATCH] mptcp: pm: in-kernel: usable client side with C-flag" failed to apply to 5.15-stable tree gregkh
2025-10-17 14:39 ` Matthieu Baerts (NGI0) [this message]
2025-10-17 14:39 ` [PATCH 5.15.y 1/2] mptcp: pm: in-kernel: usable client side with C-flag Matthieu Baerts (NGI0)
2025-10-17 14:39 ` [PATCH 5.15.y 2/2] selftests: mptcp: join: validate C-flag + def limit Matthieu Baerts (NGI0)
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=20251017143949.2844546-4-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox