From: Sasha Levin <sashal@kernel.org>
To: Matthieu Baerts <matthieu.baerts@tessares.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Paolo Abeni <pabeni@redhat.com>,
stable@vger.kernel.org, mptcp@lists.linux.dev,
Mat Martineau <mathew.j.martineau@linux.intel.com>,
"David S. Miller" <davem@davemloft.net>
Subject: Re: [PATCH 6.1 0/4] mptcp: Stable backports for 6.1.12
Date: Wed, 15 Feb 2023 11:49:21 -0500 [thread overview]
Message-ID: <Y+0NEQB5CrCa9Nlw@sashalap> (raw)
In-Reply-To: <20230214-upstream-stable-20230214-linux-6-1-12-rc1-mptcp-fixes-v1-0-02f36fa30f8c@tessares.net>
Hey Matthieu,
I've ended up doing something slightly different:
On Tue, Feb 14, 2023 at 05:05:06PM +0100, Matthieu Baerts wrote:
>Hi Greg, Sasha,
>
>Here are two MPTCP patches backports (patches 2-3/4), and one
>prerequisite (patch 1/4), that recently failed to apply to the 6.1
>stable tree. They prevent some locking issues with MPTCP.
>
>After having cherry-picked patch 1/4 -- a simple refactoring to make a
>function more generic -- patch 2/4 applied without any issue.
I did the same for 1+2.
>For patch 3/4, I had to resolve two simple function because two
>if-statements around the modified code have curly braces in v6.1, not
>later, see commit 976d302fb616 ("mptcp: deduplicate error paths on
>endpoint creation").
Instead of resolving the conflict, I took 976d302fb616 ("mptcp:
deduplicate error paths on endpoint creation".
>On top of that, patch 4/4 fixes MPTCP userspace PM selftest that has
>been recently broken due to a backport done in v6.1.8.
I didn't have this one, I'll go and queue it up. Thanks!
--
Thanks,
Sasha
prev parent reply other threads:[~2023-02-15 16:49 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-14 16:05 [PATCH 6.1 0/4] mptcp: Stable backports for 6.1.12 Matthieu Baerts
2023-02-14 16:05 ` [PATCH 6.1 1/4] mptcp: sockopt: make 'tcp_fastopen_connect' generic Matthieu Baerts
2023-02-14 16:05 ` [PATCH 6.1 2/4] mptcp: fix locking for setsockopt corner-case Matthieu Baerts
2023-02-14 16:05 ` [PATCH 6.1 3/4] mptcp: fix locking for in-kernel listener creation Matthieu Baerts
2023-02-14 16:05 ` [PATCH 6.1 4/4] selftests: mptcp: userspace: fix v4-v6 test in v6.1 Matthieu Baerts
2023-02-14 16:07 ` kernel test robot
2023-02-15 16:49 ` Sasha Levin [this message]
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=Y+0NEQB5CrCa9Nlw@sashalap \
--to=sashal@kernel.org \
--cc=davem@davemloft.net \
--cc=gregkh@linuxfoundation.org \
--cc=mathew.j.martineau@linux.intel.com \
--cc=matthieu.baerts@tessares.net \
--cc=mptcp@lists.linux.dev \
--cc=pabeni@redhat.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox