From: Greg KH <gregkh@linuxfoundation.org>
To: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
Cc: stable@vger.kernel.org, MPTCP Upstream <mptcp@lists.linux.dev>,
Paolo Abeni <pabeni@redhat.com>,
Mat Martineau <martineau@kernel.org>,
Matthieu Baerts <matthieu.baerts@tessares.net>,
"David S . Miller" <davem@davemloft.net>
Subject: Re: [PATCH 5.15.y] mptcp: move __mptcp_error_report in protocol.c
Date: Mon, 4 Mar 2024 09:26:24 +0100 [thread overview]
Message-ID: <2024030409-cement-caretaker-9151@gregkh> (raw)
In-Reply-To: <20240228173157.255719-2-matttbe@kernel.org>
On Wed, Feb 28, 2024 at 06:31:58PM +0100, Matthieu Baerts (NGI0) wrote:
> From: Paolo Abeni <pabeni@redhat.com>
>
> This will simplify the next patch ("mptcp: process pending subflow error
> on close").
>
> No functional change intended.
>
> Cc: stable@vger.kernel.org # v5.12+
> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
> Reviewed-by: Mat Martineau <martineau@kernel.org>
> Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
> Signed-off-by: David S. Miller <davem@davemloft.net>
> (cherry picked from commit d5fbeff1ab812b6c473b6924bee8748469462e2c)
> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
> ---
> Notes:
> - A simple conflict because in v5.15, we don't have 9ae8e5ad99b8
> ("mptcp: annotate lockless accesses to sk->sk_err"), and one line
> from __mptcp_error_report() is different.
> - Note that the version of __mptcp_error_report() from after
> 9ae8e5ad99b8 ("mptcp: annotate lockless accesses to sk->sk_err") has
> been taken -- with the WRITE_ONCE(sk->sk_err, -err); -- to ease the
> future backports.
All 5.15 backports now queued up, thanks!
greg k-h
prev parent reply other threads:[~2024-03-04 8:26 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <2023100421-divisible-bacterium-18b5@gregkh>
2024-02-28 17:31 ` [PATCH 5.15.y] mptcp: move __mptcp_error_report in protocol.c Matthieu Baerts (NGI0)
2024-03-04 8:26 ` Patch "mptcp: move __mptcp_error_report in protocol.c" has been added to the 5.15-stable tree gregkh
2024-03-04 8:26 ` Greg KH [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=2024030409-cement-caretaker-9151@gregkh \
--to=gregkh@linuxfoundation.org \
--cc=davem@davemloft.net \
--cc=martineau@kernel.org \
--cc=matthieu.baerts@tessares.net \
--cc=matttbe@kernel.org \
--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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).