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)
commit23c09c2640c1cb9cba919cf4f181ae99a46d53bc
tree65fd4eeb16e674c7b7257601116a82a3ce204e61
parentc8086f6d88f02aa8c87a71dca75fe5392d7679f7
parentc6c33454072fc9fe961e2b25f22a619e4fa98838
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>