]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'bpf-next'
authorDavid S. Miller <davem@davemloft.net>
Mon, 11 Jan 2016 22:32:56 +0000 (17:32 -0500)
committerDavid S. Miller <davem@davemloft.net>
Mon, 11 Jan 2016 22:32:56 +0000 (17:32 -0500)
commitebd5e0067411a49b83451f9d8c6e5d82b1be326a
tree65fd4eeb16e674c7b7257601116a82a3ce204e61
parent287f3634b633735009bce6129723887425c10fa3
parentf23ad4ea7d2f4c2684ba6db7120330a6cd4283a1
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>