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