All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
To: mptcp@lists.linux.dev, stable@vger.kernel.org,
	gregkh@linuxfoundation.org
Cc: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>, sashal@kernel.org
Subject: [PATCH 5.10.y 0/3] mptcp: fix recent failed backports
Date: Fri, 18 Apr 2025 18:45:57 +0200	[thread overview]
Message-ID: <20250418164556.3926588-5-matttbe@kernel.org> (raw)

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


             reply	other threads:[~2025-04-18 16:46 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-18 16:45 Matthieu Baerts (NGI0) [this message]
2025-04-18 16:45 ` [PATCH 5.10.y 1/3] mptcp: fix NULL pointer in can_accept_new_subflow Matthieu Baerts (NGI0)
2025-04-19 11:50   ` Sasha Levin
2025-04-18 16:45 ` [PATCH 5.10.y 2/3] mptcp: only inc MPJoinAckHMacFailure for HMAC failures Matthieu Baerts (NGI0)
2025-04-19 11:50   ` Sasha Levin
2025-04-18 16:46 ` [PATCH 5.10.y 3/3] mptcp: sockopt: fix getting IPV6_V6ONLY Matthieu Baerts (NGI0)
2025-04-19 11:46   ` Sasha Levin
  -- strict thread matches above, loose matches on Subject: below --
2024-10-19 10:29 [PATCH 5.10.y 0/3] mptcp: fix recent failed backports Matthieu Baerts (NGI0)
2024-10-21  9:42 ` Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250418164556.3926588-5-matttbe@kernel.org \
    --to=matttbe@kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=mptcp@lists.linux.dev \
    --cc=sashal@kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.