From: David S. Miller <davem@davemloft.net>
Date: Mon, 11 Jan 2016 22:32:56 +0000 (-0500)
Subject: Merge branch 'bpf-next'
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=23c09c2640c1cb9cba919cf4f181ae99a46d53bc;p=deliverable%2Flinux.git

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>
---

23c09c2640c1cb9cba919cf4f181ae99a46d53bc