diff options
author | 2016-01-11 17:32:56 -0500 | |
---|---|---|
committer | 2016-01-11 17:32:56 -0500 | |
commit | 23c09c2640c1cb9cba919cf4f181ae99a46d53bc (patch) | |
tree | 65fd4eeb16e674c7b7257601116a82a3ce204e61 /tools/perf/scripts/python/stackcollapse.py | |
parent | bonding: make mii_status sysfs node consistent (diff) | |
parent | bpf: support ipv6 for bpf_skb_{set,get}_tunnel_key (diff) | |
download | linux-dev-23c09c2640c1cb9cba919cf4f181ae99a46d53bc.tar.xz linux-dev-23c09c2640c1cb9cba919cf4f181ae99a46d53bc.zip |
Merge branch 'bpf-next'
Daniel Borkmann says:
====================
BPF update
This set adds IPv6 support for bpf_skb_{set,get}_tunnel_key() helper.
It also exports flags to user space that are being used in helpers and
weren't exported thus far. For more details, please see the individual
patches.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/perf/scripts/python/stackcollapse.py')
0 files changed, 0 insertions, 0 deletions