On Sat, Oct 19, 2024 at 11:30:46AM +0200, Matthieu Baerts (NGI0) wrote:
> Greg recently reported 6 patches that could not be applied without
> conflicts in v5.15:
>
> - e32d262c89e2 ("mptcp: handle consistently DSS corruption")
> - 4dabcdf58121 ("tcp: fix mptcp DSS corruption due to large pmtu xmit")
> - 119d51e225fe ("mptcp: fallback when MPTCP opts are dropped after 1st
> data")
> - 7decd1f5904a ("mptcp: pm: fix UaF read in mptcp_pm_nl_rm_addr_or_subflow")
> - 3d041393ea8c ("mptcp: prevent MPC handshake on port-based signal
> endpoints")
> - 5afca7e996c4 ("selftests: mptcp: join: test for prohibited MPC to
> port-based endp")
>
> Conflicts have been resolved for the 5 first ones, and documented in
> each patch.
Now queued up, thanks!
greg k-h
