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  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]
Date:   Wed, 7 Apr 2021 20:53:44 -0700
From:   "Cong Wang ." <>
To:     Stephen Rothwell <>
Cc:     David Miller <>,
        Daniel Borkmann <>,
        Alexei Starovoitov <>,
        Networking <>,
        John Fastabend <>,
        Linux Kernel Mailing List <>,
        Linux Next Mailing List <>
Subject: Re: [External] linux-next: manual merge of the net-next tree with the
 bpf tree

On Wed, Apr 7, 2021 at 8:11 PM Stephen Rothwell <> wrote:
> Hi all,
> Today's linux-next merge of the net-next tree got a conflict in:
>   net/core/skmsg.c
> between commit:
>   144748eb0c44 ("bpf, sockmap: Fix incorrect fwd_alloc accounting")
> from the bpf tree and commit:
>   e3526bb92a20 ("skmsg: Move sk_redir from TCP_SKB_CB to skb")
> from the net-next tree.
> I fixed it up (I think - see below) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging.  You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.

Looks good from my quick glance.


Powered by blists - more mailing lists