From: Willem de Bruijn <willemdebruijn.kernel@xxxxxxxxx>
Date: Fri, 24 Jul 2020 22:54:57 -0400
> From: Willem de Bruijn <willemb@xxxxxxxxxx>
>
> 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@xxxxxxxxxxxx/
> Signed-off-by: Willem de Bruijn <willemb@xxxxxxxxxx>
Thank you for the follow up patch!
Acked-by: Kuniyuki Iwashima <kuniyu@xxxxxxxxxxxx>
Best Regards,
Kuniyuki
