aboutsummaryrefslogtreecommitdiffstats
path: root/net/bridge/br_vlan.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-06-15 15:53:50 -0700
committerDavid S. Miller <davem@davemloft.net>2015-06-15 15:58:26 -0700
commit9f42c8b3ebc80e8a544bcf726689d51c7e1e0fc8 (patch)
tree6b4c9543550d114d75fad4362c6ef526a0d24b77 /net/bridge/br_vlan.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next (diff)
parentbpf: let kprobe programs use bpf_get_smp_processor_id() helper (diff)
downloadlinux-dev-9f42c8b3ebc80e8a544bcf726689d51c7e1e0fc8.tar.xz
linux-dev-9f42c8b3ebc80e8a544bcf726689d51c7e1e0fc8.zip
Merge branch 'bpf-share-helpers'
Alexei Starovoitov says: ==================== v1->v2: switched to init_user_ns from current_user_ns as suggested by Andy Introduce new helpers to access 'struct task_struct'->pid, tgid, uid, gid, comm fields in tracing and networking. Share bpf_trace_printk() and bpf_get_smp_processor_id() helpers between tracing and networking. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_vlan.c')
0 files changed, 0 insertions, 0 deletions