| commit | 23c09c2640c1cb9cba919cf4f181ae99a46d53bc | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Mon Jan 11 17:32:56 2016 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Mon Jan 11 17:32:56 2016 -0500 |
| tree | 65fd4eeb16e674c7b7257601116a82a3ce204e61 | |
| parent | c8086f6d88f02aa8c87a71dca75fe5392d7679f7 [diff] | |
| parent | c6c33454072fc9fe961e2b25f22a619e4fa98838 [diff] |
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>