From: Daniel Borkmann <dan...@iogearbox.net> Date: Fri, 18 May 2018 02:26:17 +0200
> The following pull-request contains BPF updates for your *net* tree. > > The main changes are: ... > Please consider pulling these changes from: > > git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git Pulled. > When this gets later merged into net-next there are a two trivial > BPF conflicts to resolve: ... Thanks a lot for the conflict guidance.