]> xenbits.xensource.com Git - people/royger/linux.git/commit
projects / people / royger / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 18b338f e94fa1d)
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)
commit01adc4851a8090b46c7a5ed9cfc4b97e65abfbf4
tree2ae02593d7139962648dff203f3f9701e34ccbc3tree
parent18b338f5f9539512e76fd9ebd4c6ca1a0e159e2bcommit | diff
parente94fa1d93117e7f1eb783dc9cae6c70650944449commit | 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
Unnamed repository; edit this file 'description' to name the repository.