From: Daniel Borkmann <[email protected]> Date: Mon, 26 Nov 2018 14:25:28 +0100
> The following pull-request contains BPF updates for your *net-next* tree. ... > Please consider pulling these changes from: > > git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git > > Note, there is a tiny merge conflict in BPF's kselftest Makefile. > Resolution is to take both chunks, like: > > [...] > test_sk_lookup_kern.o test_xdp_vlan.o test_queue_map.o test_stack_map.o \ > xdp_dummy.o test_map_in_map.o Pulled, thanks!
