[v1] mptcp: fix recent failed backports

[PATCH 5.10.y 0/3] mptcp: fix recent failed backports

Matthieu Baerts (NGI0) posted 3 patches 8 months ago

Diff against v1 v1 v1 v1 v1 v1
Download series mbox

Failed in applying to current master (apply log)

net/mptcp/protocol.c | 45 ++++++++++++++++++++++++++++++++++++++++++++
net/mptcp/subflow.c  | 15 +++++++++------
2 files changed, 54 insertions(+), 6 deletions(-)

Expand all Fold all

[PATCH 5.10.y 0/3] mptcp: fix recent failed backports

Posted by Matthieu Baerts (NGI0) 8 months ago

Greg recently reported 3 patches that could not be applied without
conflicts in v5.10:

 - 443041deb5ef ("mptcp: fix NULL pointer in can_accept_new_subflow")
 - 21c02e8272bc ("mptcp: only inc MPJoinAckHMacFailure for HMAC failures")
 - 8c3963375988 ("mptcp: sockopt: fix getting IPV6_V6ONLY")

Conflicts have been resolved, and documented in each patch.

Gang Yan (1):
  mptcp: fix NULL pointer in can_accept_new_subflow

Matthieu Baerts (NGI0) (2):
  mptcp: only inc MPJoinAckHMacFailure for HMAC failures
  mptcp: sockopt: fix getting IPV6_V6ONLY

 net/mptcp/protocol.c | 45 ++++++++++++++++++++++++++++++++++++++++++++
 net/mptcp/subflow.c  | 15 +++++++++------
 2 files changed, 54 insertions(+), 6 deletions(-)

-- 
2.48.1