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.1.y 0/2] mptcp: fix recent failed backports (20250919)
Date: Sat, 20 Sep 2025 00:51:19 +0200 [thread overview]
Message-ID: <20250919225118.3781035-4-matttbe@kernel.org> (raw)
The following patches could not be applied without conflicts in this
tree:
- 2293c57484ae ("mptcp: pm: nl: announce deny-join-id0 flag")
- 24733e193a0d ("selftests: mptcp: userspace pm: validate deny-join-id0 flag")
Conflicts have been resolved, and documented in each patch.
Matthieu Baerts (NGI0) (2):
mptcp: pm: nl: announce deny-join-id0 flag
selftests: mptcp: userspace pm: validate deny-join-id0 flag
include/uapi/linux/mptcp.h | 6 ++++--
net/mptcp/pm_netlink.c | 7 +++++++
tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 7 +++++++
tools/testing/selftests/net/mptcp/userspace_pm.sh | 14 ++++++++++++--
4 files changed, 30 insertions(+), 4 deletions(-)
--
2.51.0
next reply other threads:[~2025-09-19 22:51 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-19 22:51 Matthieu Baerts (NGI0) [this message]
2025-09-19 22:51 ` [PATCH 6.1.y 1/2] mptcp: pm: nl: announce deny-join-id0 flag Matthieu Baerts (NGI0)
2025-09-21 17:24 ` Patch "mptcp: pm: nl: announce deny-join-id0 flag" has been added to the 6.1-stable tree gregkh
2025-09-19 22:51 ` [PATCH 6.1.y 2/2] selftests: mptcp: userspace pm: validate deny-join-id0 flag Matthieu Baerts (NGI0)
2025-09-21 17:24 ` Patch "selftests: mptcp: userspace pm: validate deny-join-id0 flag" has been added to the 6.1-stable tree gregkh
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=20250919225118.3781035-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 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.