[6.6.y,0/4] mptcp: fix recent failed backports

Message

Matthieu Baerts Oct. 18, 2024, 3:57 p.m. UTC

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.

Geliang Tang (1):
  selftests: mptcp: join: change capture/checksum as bool

Matthieu Baerts (NGI0) (1):
  selftests: mptcp: remove duplicated variables

Paolo Abeni (2):
  tcp: fix mptcp DSS corruption due to large pmtu xmit
  selftests: mptcp: join: test for prohibited MPC to port-based endp

 net/ipv4/tcp_output.c                         |   4 +-
 .../testing/selftests/net/mptcp/mptcp_join.sh | 135 ++++++++++++------
 .../testing/selftests/net/mptcp/mptcp_lib.sh  |  11 --
 3 files changed, 96 insertions(+), 54 deletions(-)

Comments

Greg KH Oct. 21, 2024, 9:37 a.m. UTC | #1

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