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,
Christoph Paasch <cpaasch@apple.com>,
Jakub Kicinski <kuba@kernel.org>
Subject: Re: [PATCH 6.1 0/2] mptcp: Stable backports for v6.1
Date: Fri, 24 Mar 2023 20:43:06 -0400 [thread overview]
Message-ID: <ZB5Dmt1lm/4Js3di@sashalap> (raw)
In-Reply-To: <20230323-upstream-stable-conflicts-6-1-v1-0-ef2a6180eaf3@tessares.net>
On Thu, Mar 23, 2023 at 06:49:00PM +0100, Matthieu Baerts wrote:
>Hi Greg, Sasha,
>
>Recently, 3 patches related to MPTCP have not been backported due to
>conflicts:
>
> - 3a236aef280e ("mptcp: refactor passive socket initialization")
> - b6985b9b8295 ("mptcp: use the workqueue to destroy unaccepted sockets")
> - 0a3f4f1f9c27 ("mptcp: fix UaF in listener shutdown")
>
>Yesterday, Sasha has resolved the conflicts for the first one and he has
>already added this one to v6.1.
>
>In fact, this first patch is a requirement for the two others.
>
>I then here resolved the conflicts for the two other patches, documented
>that in each patch and ran our tests suite. Everything seems OK.
>
>Do you mind adding these two patches to v6.1 queue as well if you don't
>mind?
Queued up, thanks!
--
Thanks,
Sasha
prev parent reply other threads:[~2023-03-25 0:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-23 17:49 [PATCH 6.1 0/2] mptcp: Stable backports for v6.1 Matthieu Baerts
2023-03-23 17:49 ` [PATCH 6.1 1/2] mptcp: use the workqueue to destroy unaccepted sockets Matthieu Baerts
2023-03-23 17:49 ` [PATCH 6.1 2/2] mptcp: fix UaF in listener shutdown Matthieu Baerts
2023-03-25 0:43 ` 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=ZB5Dmt1lm/4Js3di@sashalap \
--to=sashal@kernel.org \
--cc=cpaasch@apple.com \
--cc=gregkh@linuxfoundation.org \
--cc=kuba@kernel.org \
--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