Hi Greg, Sasha,
Recently, 2 patches related to MPTCP have not been backported to v6.1
tree due to conflicts:
- 2a6a870e44dd ("mptcp: stops worker on unaccepted sockets at listener close") [1]
- 63740448a32e ("mptcp: fix accept vs worker race") [2]
I then here resolved the conflicts, documented what I did in each patch
and ran our tests suite. Everything seems OK.
These patches are based on top of the latest linux-stable-rc/linux-6.1.y
version.
Do you mind adding these two patches to v6.1 queue please?
[1] https://lore.kernel.org/r/2023042259-gravity-hate-a9a3@gregkh
[2] https://lore.kernel.org/r/2023042215-chastise-scuba-8478@gregkh
Signed-off-by: Matthieu Baerts <matthieu.baerts@xxxxxxxxxxxx>
---
Paolo Abeni (2):
mptcp: stops worker on unaccepted sockets at listener close
mptcp: fix accept vs worker race
net/mptcp/protocol.c | 74 +++++++++++++++++++++++++++++++++---------------
net/mptcp/protocol.h | 2 ++
net/mptcp/subflow.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++--
3 files changed, 130 insertions(+), 26 deletions(-)
---
base-commit: e4ff6ff54dea67f94036a357201b0f9807405cc6
change-id: 20230424-upstream-stable-20230424-conflicts-6-1-f325fe76c540
Best regards,
--
Matthieu Baerts <matthieu.baerts@xxxxxxxxxxxx>
