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
