]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8a8d4b2 b2997f9)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
authorDavid S. Miller <davem@davemloft.net>
Tue, 8 May 2018 03:35:08 +0000 (23:35 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 8 May 2018 03:35:08 +0000 (23:35 -0400)
commit660eae22b6cce65efa4558afe06d2afc12392a17
tree2ae02593d7139962648dff203f3f9701e34ccbc3tree | snapshot
parent8a8d4b208965494f5a9ca44818c260b2a198d514commit | diff
parentb2997f99bef45d3e525b2e25da46c3f1c9c966c5commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

Minor conflict, a CHECK was placed into an if() statement
in net-next, whilst a newline was added to that CHECK
call in 'net'.  Thanks to Daniel for the merge resolution.

Signed-off-by: David S. Miller <davem@davemloft.net>
MAINTAINERS diff1 | diff2 | blob | history
arch/x86/Kconfig diff1 | diff2 | blob | history
arch/x86/net/bpf_jit_comp.c diff1 | diff2 | blob | history
include/linux/netdevice.h diff1 | diff2 | blob | history
net/Kconfig diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history
tools/testing/selftests/bpf/test_progs.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.