Merge branch 'bpf-tracepoints'
authorDavid S. Miller <davem@davemloft.net>
Wed, 25 Jan 2017 18:17:48 +0000 (13:17 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 25 Jan 2017 18:17:48 +0000 (13:17 -0500)
commitcca316f3562afea7efa35acdd84ed899e23e6e29
tree110dfd4447ba997d36b80e2e534ae234ecd18eef
parent60b1af3300724d211bb0b420c1fbe6bf5b87b013
parenta67edbf4fb6deadcfe57a04a134abed4a5ba3bb5
Merge branch 'bpf-tracepoints'

Daniel Borkmann says:

====================
BPF tracepoints

This set adds tracepoints to BPF for better introspection and
debugging. The first two patches are prerequisite for the actual
third patch that adds the tracepoints. I think the first two are
small and straight forward enough that they could ideally go via
net-next, but I'm also open to other suggestions on how to route
them in case that's not applicable (it would reduce potential
merge conflicts on BPF side, though). For details, please see
individual patches.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>