[PATCH 6.1.y 0/2] mptcp: fix recent failed backports

["Matthieu Baerts (NGI0)" <matttbe@kernel.org>]

Greg recently reported 3 patches that could not be applied without
conflicts in v6.1:

 - 4dabcdf58121 ("tcp: fix mptcp DSS corruption due to large pmtu xmit")
 - 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 two first ones, and documented in
each patch.

The last patch has not been backported: this is an extra test for the
selftests validating the previous commit, and there are a lot of
conflicts. That's fine not to backport this test, it is still possible
to use the selftests from a newer version and run them on this older
kernel.

Paolo Abeni (2):
  tcp: fix mptcp DSS corruption due to large pmtu xmit
  mptcp: prevent MPC handshake on port-based signal endpoints

 net/ipv4/tcp_output.c  |  4 +---
 net/mptcp/mib.c        |  1 +
 net/mptcp/mib.h        |  1 +
 net/mptcp/pm_netlink.c |  1 +
 net/mptcp/protocol.h   |  1 +
 net/mptcp/subflow.c    | 11 +++++++++++
 6 files changed, 16 insertions(+), 3 deletions(-)

-- 
2.45.2