Re: linux-next: manual merge of the bpf-next tree with the net tree

Hi all, On Wed, 22 Jul 2020 13:21:43 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the bpf-next tree got conflicts in: > > net/ipv4/udp.c > net/ipv6/udp.c > > between commit: > > efc6b6f6c311 ("udp: Improve load balancing for SO_REUSEPORT.") > > from the net tree and co

Re: linux-next: manual merge of the bpf-next tree with the net tree

On Wed, Jul 22, 2020 at 8:50 AM Willem de Bruijn wrote: > > > TBH, I don't what is the preferred way to handle it. Perhaps DaveM or > > Alexei/Daniel can say what would make their life easiest? > > Good point. > > With the above, there still remains a merge conflict, of course. But > then we can t

Re: linux-next: manual merge of the bpf-next tree with the net tree

On Wed, Jul 22, 2020 at 11:25 AM Jakub Sitnicki wrote: > > On Wed, Jul 22, 2020 at 05:05 PM CEST, Willem de Bruijn wrote: > > On Wed, Jul 22, 2020 at 11:02 AM Jakub Sitnicki > > wrote: > >> > >> On Wed, Jul 22, 2020 at 04:42 PM CEST, Kuniyuki Iwashima wrote: > >> > Can I submit a patch to net tr

Re: linux-next: manual merge of the bpf-next tree with the net tree

On Wed, Jul 22, 2020 at 05:05 PM CEST, Willem de Bruijn wrote: > On Wed, Jul 22, 2020 at 11:02 AM Jakub Sitnicki wrote: >> >> On Wed, Jul 22, 2020 at 04:42 PM CEST, Kuniyuki Iwashima wrote: >> > Can I submit a patch to net tree that rewrites udp[46]_lib_lookup2() to >> > use only 'result' ? >> >>

Re: linux-next: manual merge of the bpf-next tree with the net tree

On Wed, Jul 22, 2020 at 11:02 AM Jakub Sitnicki wrote: > > On Wed, Jul 22, 2020 at 04:42 PM CEST, Kuniyuki Iwashima wrote: > > Can I submit a patch to net tree that rewrites udp[46]_lib_lookup2() to > > use only 'result' ? > > Feel free. That should make the conflict resolution even easier later >

Re: linux-next: manual merge of the bpf-next tree with the net tree

On Wed, Jul 22, 2020 at 04:42 PM CEST, Kuniyuki Iwashima wrote: > Can I submit a patch to net tree that rewrites udp[46]_lib_lookup2() to > use only 'result' ? Feel free. That should make the conflict resolution even easier later on. Thanks, -jkbs

Re: linux-next: manual merge of the bpf-next tree with the net tree

From: Jakub Sitnicki Date: Wed, 22 Jul 2020 14:17:05 +0200 > On Wed, Jul 22, 2020 at 05:21 AM CEST, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the bpf-next tree got conflicts in: > > > > net/ipv4/udp.c > > net/ipv6/udp.c > > > > between commit: > > > > efc6b6

Re: linux-next: manual merge of the bpf-next tree with the net tree

On Wed, Jul 22, 2020 at 05:21 AM CEST, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the bpf-next tree got conflicts in: > > net/ipv4/udp.c > net/ipv6/udp.c > > between commit: > > efc6b6f6c311 ("udp: Improve load balancing for SO_REUSEPORT.") > > from the net tree and com

linux-next: manual merge of the bpf-next tree with the net tree

Hi all, Today's linux-next merge of the bpf-next tree got conflicts in: net/ipv4/udp.c net/ipv6/udp.c between commit: efc6b6f6c311 ("udp: Improve load balancing for SO_REUSEPORT.") from the net tree and commits: 7629c73a1466 ("udp: Extract helper for selecting socket from reuseport gr

Re: linux-next: manual merge of the bpf-next tree with the net tree

Hi all, This is now a conflict between the net and net-next trees. On Mon, 14 Oct 2019 10:32:32 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the bpf-next tree got a conflict in: > > tools/lib/bpf/Makefile > > between commit: > > 1bd63524593b ("libbpf: handle symbol versi

linux-next: manual merge of the bpf-next tree with the net tree

Hi all, Today's linux-next merge of the bpf-next tree got a conflict in: tools/lib/bpf/Makefile between commit: 1bd63524593b ("libbpf: handle symbol versioning properly for libbpf.a") from the net tree and commits: 5c26f9a78358 ("libbpf: Don't use cxx to test_libpf target") 793a349cd8