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

On Sat, Oct 19, 2024 at 12:29:06PM +0200, Matthieu Baerts (NGI0) wrote:
> 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")

All now queued up, thanks!

greg k-h