]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 26 Apr 2018 03:04:22 +0000 (23:04 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 26 Apr 2018 03:04:22 +0000 (23:04 -0400)
commit926907aa907d4cb0382fd3b2a08ba3fb3fd96d56
treef258739642417d820e1683e97966a3804f323ba9
parent49cfe15c514a75b2e247d4cfcb4c55deef319a09
parent3264806caa0c55130e3689728ba858a23282be45
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Merging net into net-next to help the bpf folks avoid
some really ugly merge conflicts.

Signed-off-by: David S. Miller <davem@davemloft.net>
include/linux/bpf.h
kernel/bpf/arraymap.c
kernel/bpf/syscall.c
net/core/filter.c