Subject: Re: linux-next: manual merge of the net-next tree with the net tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 29 Aug 2024 10:10:56 +1000

Hi Jason,

On Thu, 29 Aug 2024 08:04:16 +0800 Jason Xing <[email-masked]> wrote:
>
> On Wed, Aug 28, 2024 at 9:22 AM Stephen Rothwell <[email-masked]> wrote:
> >
> > 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