Hi Jason,

On Thu, 29 Aug 2024 08:04:16 +0800 Jason Xing [off-list ref] wrote:

On Wed, Aug 28, 2024 at 9:22 AM Stephen Rothwell [off-list ref] wrote:

quoted

diff --cc net/ipv4/tcp.c
index 831a18dc7aa6,8514257f4ecd..000000000000

--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c

@@@ -4653,10 -4649,12 +4656,10 @@@ int tcp_abort(struct sock *sk, int err
        local_bh_disable();
        bh_lock_sock(sk);

 -      if (!sock_flag(sk, SOCK_DEAD)) {
 -              if (tcp_need_reset(sk->sk_state))
 -                      tcp_send_active_reset(sk, GFP_ATOMIC,
 -                                            SK_RST_REASON_TCP_STATE);
 -              tcp_done_with_error(sk, err);
 -      }
 +      if (tcp_need_reset(sk->sk_state))
 +              tcp_send_active_reset(sk, GFP_ATOMIC,
-                                     SK_RST_REASON_NOT_SPECIFIED);
++                                    SK_RST_REASON_TCP_STATE);  

"++"?

This is a "combined diff" of the merge commit.  The "++" line does not
appear verbatim in either of the parent trees.

-- 
Cheers,
Stephen Rothwell