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>
Subject: [PATCH 6.6.y 0/5] Backport "mptcp: don't account accept() of non-MPC client as fallback to TCP"
Date: Fri, 5 Apr 2024 17:36:37 +0200 [thread overview]
Message-ID: <20240405153636.958019-7-matttbe@kernel.org> (raw)
In-Reply-To: <2024040520-unselect-antitrust-a41b@gregkh>
Commit 7a1b3490f47e ("mptcp: don't account accept() of non-MPC client as
fallback to TCP") does not apply to the 6.8-stable tree. That's because
there are some conflicts with recent refactoring done in the selftests
and around the 'accept()' code:
- commit 629b35a225b0 ("selftests: mptcp: display simult in extra_msg")
- commit e3aae1098f10 ("selftests: mptcp: connect: fix shellcheck warnings")
- commit e7c42bf4d320 ("selftests: mptcp: use += operator to append strings"
- commit 8e2b8a9fa512 ("mptcp: don't overwrite sock_ops in mptcp_is_tcpsk()")
These 4 patches look harmless, probably safer and easier to backport
them, than diverging even more from the development branch.
Note that applied in this order, all these 5 patches have been
backported without conflicts. Tests are still OK.
Davide Caratti (2):
mptcp: don't overwrite sock_ops in mptcp_is_tcpsk()
mptcp: don't account accept() of non-MPC client as fallback to TCP
Geliang Tang (2):
selftests: mptcp: display simult in extra_msg
selftests: mptcp: use += operator to append strings
Matthieu Baerts (NGI0) (1):
selftests: mptcp: connect: fix shellcheck warnings
net/mptcp/protocol.c | 106 ++++++--------
net/mptcp/subflow.c | 2 +
.../selftests/net/mptcp/mptcp_connect.sh | 134 +++++++++++-------
.../testing/selftests/net/mptcp/mptcp_join.sh | 33 +++--
4 files changed, 144 insertions(+), 131 deletions(-)
--
2.43.0
next parent reply other threads:[~2024-04-05 15:37 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <2024040520-unselect-antitrust-a41b@gregkh>
2024-04-05 15:36 ` Matthieu Baerts (NGI0) [this message]
2024-04-05 15:36 ` [PATCH 6.6.y 1/5] selftests: mptcp: display simult in extra_msg Matthieu Baerts (NGI0)
2024-04-05 15:36 ` [PATCH 6.6.y 2/5] selftests: mptcp: connect: fix shellcheck warnings Matthieu Baerts (NGI0)
2024-04-05 15:36 ` [PATCH 6.6.y 3/5] selftests: mptcp: use += operator to append strings Matthieu Baerts (NGI0)
2024-04-08 11:31 ` Greg KH
2024-04-08 16:10 ` Matthieu Baerts
2024-04-09 12:16 ` Greg KH
2024-04-09 15:04 ` Matthieu Baerts
2024-04-11 7:32 ` Greg KH
2024-04-11 10:06 ` Matthieu Baerts
2024-04-05 15:36 ` [PATCH 6.6.y 4/5] mptcp: don't overwrite sock_ops in mptcp_is_tcpsk() Matthieu Baerts (NGI0)
2024-04-05 15:36 ` [PATCH 6.6.y 5/5] mptcp: don't account accept() of non-MPC client as fallback to TCP Matthieu Baerts (NGI0)
2024-04-11 10:07 ` [PATCH 6.6.y] selftests: mptcp: use += operator to append strings Matthieu Baerts (NGI0)
2024-04-15 10:44 ` 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=20240405153636.958019-7-matttbe@kernel.org \
--to=matttbe@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=mptcp@lists.linux.dev \
--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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).