public inbox for stable@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 5.10.y 0/3] mptcp: fix recent failed backports
@ 2024-10-19 10:29 Matthieu Baerts (NGI0)
  2024-10-19 10:29 ` [PATCH 5.10.y 1/3] mptcp: track and update contiguous data status Matthieu Baerts (NGI0)
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Matthieu Baerts (NGI0) @ 2024-10-19 10:29 UTC (permalink / raw)
  To: mptcp, stable, gregkh; +Cc: Matthieu Baerts (NGI0), sashal

Greg recently reported 2 patches that could not be applied without
conflicts in v5.10:

 - e32d262c89e2 ("mptcp: handle consistently DSS corruption")
 - 4dabcdf58121 ("tcp: fix mptcp DSS corruption due to large pmtu xmit")

Conflicts have been resolved, and documented in each patch.

One extra commit has been backported, to support allow_infinite_fallback
which is used by one commit from the list above:

 - 0530020a7c8f ("mptcp: track and update contiguous data status")

Geliang Tang (1):
  mptcp: track and update contiguous data status

Paolo Abeni (2):
  mptcp: handle consistently DSS corruption
  tcp: fix mptcp DSS corruption due to large pmtu xmit

 net/ipv4/tcp_output.c |  2 +-
 net/mptcp/mib.c       |  2 ++
 net/mptcp/mib.h       |  2 ++
 net/mptcp/protocol.c  | 26 ++++++++++++++++++++++----
 net/mptcp/protocol.h  |  1 +
 net/mptcp/subflow.c   |  3 ++-
 6 files changed, 30 insertions(+), 6 deletions(-)

-- 
2.45.2


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2024-10-21  9:42 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-19 10:29 [PATCH 5.10.y 0/3] mptcp: fix recent failed backports Matthieu Baerts (NGI0)
2024-10-19 10:29 ` [PATCH 5.10.y 1/3] mptcp: track and update contiguous data status Matthieu Baerts (NGI0)
2024-10-19 10:29 ` [PATCH 5.10.y 2/3] mptcp: handle consistently DSS corruption Matthieu Baerts (NGI0)
2024-10-19 10:29 ` [PATCH 5.10.y 3/3] tcp: fix mptcp DSS corruption due to large pmtu xmit Matthieu Baerts (NGI0)
2024-10-21  9:42 ` [PATCH 5.10.y 0/3] mptcp: fix recent failed backports Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox