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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20240829101056.47cd3b61@canb.auug.org.au>
Date: Thu, 29 Aug 2024 10:10:56 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jason Xing <kerneljasonxing@...il.com>
Cc: David Miller <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>,
 Paolo Abeni <pabeni@...hat.com>, Jason Xing <kernelxing@...cent.com>,
 Networking <netdev@...r.kernel.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Xueming Feng <kuro@...oa.me>
Subject: Re: linux-next: manual merge of the net-next tree with the net tree

Hi Jason,

On Thu, 29 Aug 2024 08:04:16 +0800 Jason Xing <kerneljasonxing@...il.com> wrote:
>
> On Wed, Aug 28, 2024 at 9:22 AM Stephen Rothwell <sfr@...b.auug.org.au> 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

Content of type "application/pgp-signature" skipped