On Fri, Oct 18, 2024 at 05:57:35PM +0200, Matthieu Baerts (NGI0) wrote:
> Greg recently reported 2 patches that could not be applied without
> conflict in v6.6:
>
> - 4dabcdf58121 ("tcp: fix mptcp DSS corruption due to large pmtu xmit")
> - 5afca7e996c4 ("selftests: mptcp: join: test for prohibited MPC to
> port-based endp")
>
> Conflicts have been resolved, and documented in each patch.
>
> Note that there are two extra patches:
>
> - 8c6f6b4bb53a ("selftests: mptcp: join: change capture/checksum as
> bool"): to avoid some conflicts
> - "selftests: mptcp: remove duplicated variables": a dedicated patch
> for v6.6, to fix some previous backport issues.
All queued up, thanks!
greg k-h
