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, sashal@kernel.org
Cc: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
Subject: [PATCH 6.1.y 0/3] Backport of "mptcp: fix full TCP keep-alive support"
Date: Wed, 29 May 2024 12:00:23 +0200	[thread overview]
Message-ID: <20240529100022.3373664-5-matttbe@kernel.org> (raw)

It looks like the patch "mptcp: fix full TCP keep-alive support" has
been backported up to v6.8 recently (thanks!), but not before due to
conflicts.

I had to adapt a bit the code not to backport new features, but the
modifications were simple, and isolated from the rest. Conflicts have
been described in each patch.

MPTCP sockopts tests have been executed, and no issues have been
reported.

Matthieu Baerts (NGI0) (1):
  mptcp: fix full TCP keep-alive support

Paolo Abeni (2):
  mptcp: avoid some duplicate code in socket option handling
  mptcp: cleanup SOL_TCP handling

 net/mptcp/protocol.h |   3 +
 net/mptcp/sockopt.c  | 144 +++++++++++++++++++++++++++++++------------
 2 files changed, 108 insertions(+), 39 deletions(-)

-- 
2.43.0


             reply	other threads:[~2024-05-29 10:00 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-29 10:00 Matthieu Baerts (NGI0) [this message]
2024-05-29 10:00 ` [PATCH 6.1.y 1/3] mptcp: avoid some duplicate code in socket option handling Matthieu Baerts (NGI0)
2024-06-12 12:55   ` Patch "mptcp: avoid some duplicate code in socket option handling" has been added to the 6.1-stable tree gregkh
2024-05-29 10:00 ` [PATCH 6.1.y 2/3] mptcp: cleanup SOL_TCP handling Matthieu Baerts (NGI0)
2024-06-12 12:55   ` Patch "mptcp: cleanup SOL_TCP handling" has been added to the 6.1-stable tree gregkh
2024-05-29 10:00 ` [PATCH 6.1.y 3/3] mptcp: fix full TCP keep-alive support Matthieu Baerts (NGI0)
2024-06-12 12:55   ` Patch "mptcp: fix full TCP keep-alive support" has been added to the 6.1-stable tree gregkh

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=20240529100022.3373664-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.