On Fri, Jun 14, 2019 at 3:36 PM Daniel Borkmann <daniel@xxxxxxxxxxxxx> wrote: > > > >> Force the minimum number of locks to two. > >> > >> Signed-off-by: Arthur Fabre <afabre@xxxxxxxxxxxxxx> > >> Fixes: 6ac99e8f23d4 ("bpf: Introduce bpf sk local storage") > > The offending commit is already in Linus tree hence if so bpf tree. Arthur, please > elaborate why bpf-next is targeted specifically here? It's certainly should be in bpf tree. It didn't apply directly, so I tweaked it a tiny bit, reduced verbosity of commit log and pushed to bpf tree. Thanks for the fix!