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>
No related branches found
No related tags found
Showing
- Documentation/bpf/bpf_devel_QA.txt 9 additions, 1 deletionDocumentation/bpf/bpf_devel_QA.txt
- arch/x86/net/bpf_jit_comp.c 11 additions, 1 deletionarch/x86/net/bpf_jit_comp.c
- drivers/net/phy/phy_device.c 10 additions, 1 deletiondrivers/net/phy/phy_device.c
- include/linux/bpf.h 3 additions, 1 deletioninclude/linux/bpf.h
- kernel/bpf/arraymap.c 2 additions, 1 deletionkernel/bpf/arraymap.c
- kernel/bpf/sockmap.c 47 additions, 4 deletionskernel/bpf/sockmap.c
- kernel/bpf/syscall.c 2 additions, 2 deletionskernel/bpf/syscall.c
- net/core/filter.c 1 addition, 0 deletionsnet/core/filter.c
- net/rds/ib_cm.c 2 additions, 1 deletionnet/rds/ib_cm.c
- net/smc/af_smc.c 0 additions, 4 deletionsnet/smc/af_smc.c
- samples/sockmap/Makefile 5 additions, 2 deletionssamples/sockmap/Makefile
- tools/bpf/Makefile 2 additions, 0 deletionstools/bpf/Makefile
Loading
Please register or sign in to comment