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  PHC 
Open Source and information security mailing list archives
 
Hash Suite for Android: free password hash cracker in your pocket
[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Date:   Sat, 25 Jul 2020 18:01:03 -0700
From:   Alexei Starovoitov <alexei.starovoitov@...il.com>
To:     Kuniyuki Iwashima <kuniyu@...zon.co.jp>
Cc:     Willem de Bruijn <willemdebruijn.kernel@...il.com>,
        Alexei Starovoitov <ast@...nel.org>, bpf <bpf@...r.kernel.org>,
        Daniel Borkmann <daniel@...earbox.net>,
        "David S. Miller" <davem@...emloft.net>,
        Jakub Sitnicki <jakub@...udflare.com>,
        Jakub Kicinski <kuba@...nel.org>,
        Network Development <netdev@...r.kernel.org>,
        Willem de Bruijn <willemb@...gle.com>
Subject: Re: [PATCH bpf-next] udp: reduce merge conflict on udp[46]_lib_lookup2

On Sat, Jul 25, 2020 at 3:58 AM Kuniyuki Iwashima <kuniyu@...zon.co.jp> wrote:
>
> From:   Willem de Bruijn <willemdebruijn.kernel@...il.com>
> Date:   Fri, 24 Jul 2020 22:54:57 -0400
> > From: Willem de Bruijn <willemb@...gle.com>
> >
> > Commit efc6b6f6c311 ("udp: Improve load balancing for SO_REUSEPORT.")
> >
> > in net conflicts with
> >
> > Commit 72f7e9440e9b ("udp: Run SK_LOOKUP BPF program on socket lookup")
> >
> > in bpf-next.
> >
> > Commit 4a0e87bb1836 ("udp: Don't discard reuseport selection when group
> > has connections")
> >
> > also in bpf-next reduces the conflict.
> >
> > Further simplify by applying the main change of the first commit to
> > bpf-next. After this a conflict remains, but the bpf-next side can be
> > taken as is.
> >
> > Now unused variable reuseport_result added in net must also be
> > removed. That applies without a conflict, so is harder to spot.
> >
> > Link: http://patchwork.ozlabs.org/project/netdev/patch/20200722165227.51046-1-kuniyu@amazon.co.jp/
> > Signed-off-by: Willem de Bruijn <willemb@...gle.com>
>
> Thank you for the follow up patch!
>
> Acked-by: Kuniyuki Iwashima <kuniyu@...zon.co.jp>

net is being merged into net-next. I think this one is no longer necessary.

Powered by blists - more mailing lists