tree 8ffadc3b984132b1cd44a8ab53e7fce257a8198f
parent e327f4e193b6a176f4dc3b19faf6371a8917588d
parent 4018ab1875e0d00b84ac61bc15427136ad55849e
author David S. Miller <davem@davemloft.net> 1457727267 -0500
committer David S. Miller <davem@davemloft.net> 1457727267 -0500

Merge branch 'bpf-flow-labels'

Daniel Borkmann says:

====================
BPF support for flow labels

This set adds support for tunnel key flow labels for vxlan
and geneve devices in collect meta data mode and eBPF support
for managing these. For details please see individual patches.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>