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

On Wed, Apr 7, 2021 at 8:11 PM Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > net/core/skmsg.c > > between commit: > > 144748eb0c44 ("bpf, sockmap: Fix incorrect fwd_alloc accounting") > > from the bpf tree and commit: > > e3526bb

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

On Wed, Apr 7, 2021 at 8:02 PM Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > include/linux/skmsg.h > > between commit: > > 1c84b33101c8 ("bpf, sockmap: Fix sk->prot unhash op reset") > > from the bpf tree and commit: > > 8a59f9d1