diff options
author | David S. Miller <davem@davemloft.net> | 2014-09-09 21:27:22 +0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-09-09 21:27:22 +0400 |
commit | afddacc3ccd048c49c7f4f0ad0b6a40730c74715 (patch) | |
tree | f990840a7b9e6afe48ea73a5fdafe1cdc50f936d /include/net/ip.h | |
parent | 5b4c314575ea6edd57c547c2123083d88d8ff4e6 (diff) | |
parent | daedfb22451dd02b35c0549566cbb7cc06bdd53b (diff) | |
download | linux-afddacc3ccd048c49c7f4f0ad0b6a40730c74715.tar.xz |
Merge branch 'ebpf'
Alexei Starovoitov says:
====================
load imm64 insn and uapi/linux/bpf.h
V9->V10
- no changes, added Daniel's ack
Note they're on top of Hannes's patch in the same area [1]
V8 thread with 'why' reasoning and end goal [2]
Original set [3] of ~28 patches I'm planning to present in 4 stages:
I. this 2 patches to fork off llvm upstreaming
II. bpf syscall with manpage and map implementation
III. bpf program load/unload with verifier testsuite (1st user of
instruction macros from bpf.h and 1st user of load imm64 insn)
IV. tracing, etc
[1] http://patchwork.ozlabs.org/patch/385266/
[2] https://lkml.org/lkml/2014/8/27/628
[3] https://lkml.org/lkml/2014/8/26/859
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/ip.h')
0 files changed, 0 insertions, 0 deletions