From: Daniel Borkmann <dan...@iogearbox.net> Date: Fri, 27 Apr 2018 03:14:42 +0200
> 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 Pulled and build testing before pushing back out. > There are two trivial merge conflicts while pulling: > > 1) Remove samples/sockmap/Makefile since all sockmap tests have been > moved to selftests. > 2) Add both hunks from tools/testing/selftests/bpf/.gitignore to the > file since git should ignore all of them. Thanks for this.
