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

2020-07-25 Thread Alexei Starovoitov
On Sat, Jul 25, 2020 at 3:58 AM Kuniyuki Iwashima wrote: > > From: Willem de Bruijn > Date: Fri, 24 Jul 2020 22:54:57 -0400 > > From: Willem de Bruijn > > > > Commit efc6b6f6c311 ("udp: Improve load balancing for SO_REUSEPORT.") > > > > in net conflicts with > > > > Commit 72f7e9440e9b ("udp

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

2020-07-25 Thread Kuniyuki Iwashima
From: Willem de Bruijn Date: Fri, 24 Jul 2020 22:54:57 -0400 > From: Willem de Bruijn > > 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. > > Commi

[PATCH bpf-next] udp: reduce merge conflict on udp[46]_lib_lookup2

2020-07-24 Thread Willem de Bruijn
From: Willem de Bruijn 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") al