netdev - Re: [PATCH bpf-next] udp: reduce merge conflict on udp[46]_lib

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] [thread-next>] [day] [month] [year] [list]

Date:   Sat, 25 Jul 2020 19:58:41 +0900
From:   Kuniyuki Iwashima <kuniyu@...zon.co.jp>
To:     <willemdebruijn.kernel@...il.com>
CC:     <ast@...nel.org>, <bpf@...r.kernel.org>, <daniel@...earbox.net>,
        <davem@...emloft.net>, <jakub@...udflare.com>, <kuba@...nel.org>,
        <kuniyu@...zon.co.jp>, <netdev@...r.kernel.org>,
        <willemb@...gle.com>
Subject: Re: [PATCH bpf-next] udp: reduce merge conflict on udp[46]_lib_lookup2

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>

Best Regards,
Kuniyuki