Re: [PATCH 5.15.y] mptcp: move __mptcp_error_report in protocol.c

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