| commit | 9f42c8b3ebc80e8a544bcf726689d51c7e1e0fc8 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Mon Jun 15 15:53:50 2015 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Mon Jun 15 15:58:26 2015 -0700 |
| tree | 6b4c9543550d114d75fad4362c6ef526a0d24b77 | |
| parent | ada6c1de9ecabcfc5619479bcd29a208f2e248a0 [diff] | |
| parent | ab1973d3258aa8c40d153dc12bbb1aac56731e47 [diff] |
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>