projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e327f4e 4018ab1)
Merge branch 'bpf-flow-labels'
authorDavid S. Miller <davem@davemloft.net>
Fri, 11 Mar 2016 20:14:27 +0000 (15:14 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 11 Mar 2016 20:14:27 +0000 (15:14 -0500)
commit627caa9d319d2402f3d41ebd8dd0fde9d41a33a7
tree8ffadc3b984132b1cd44a8ab53e7fce257a8198ftree | snapshot
parente327f4e193b6a176f4dc3b19faf6371a8917588dcommit | diff
parent4018ab1875e0d00b84ac61bc15427136ad55849ecommit | diff
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>
ep93xx device tree rework repo: git://git.maquefel.me/linux.git