From: Daniel Borkmann <[email protected]>
Date: Thu, 24 May 2018 18:38:02 +0200
> The following pull-request contains BPF updates for your *net* tree.
>
> The main changes are:
>
> 1) Fix a bug in the original fix to prevent out of bounds speculation when
> multiple tail call maps from different branches or calls end up at the
> same tail call helper invocation, from Daniel.
>
> 2) Two selftest fixes, one in reuseport_bpf_numa where test is skipped in
> case of missing numa support and another one to update kernel config to
> properly support xdp_meta.sh test, from Anders.
>
> Please consider pulling these changes from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
Pulled, thanks Danile.
> Would be great if you have a chance to merge net into net-next after that.
>
> The verifier fix would be needed later as a dependency in bpf-next for
> upcomig work there. When you do the merge there's a trivial conflict on
> BPF side with 849fa50662fb ("bpf/verifier: refine retval R0 state for
> bpf_get_stack helper"): Resolution is to keep both functions, the
> do_refine_retval_range() and record_func_map().
I'll try to push it along as soon as I can.
Thanks for the merge conflict heads-up.
