tree 5ae7116e18f4bd6646ba8f5809a1d1eb6efbda33
parent 810813c47a564416f6306ae214e2661366c987a7
parent 1400615d64cf5afee533aff8234c837da465841b
author David S. Miller <davem@davemloft.net> 1457463532 -0500
committer David S. Miller <davem@davemloft.net> 1457463532 -0500

Merge branch 'bpf-next'

Daniel Borkmann says:

====================
BPF updates

Couple of misc updates to BPF, besides others this series adds
bpf_csum_diff() to be used with L3 csums, allows for managing
tunnel options for collect meta data mode, and enabling ipv6
traffic class for collect meta data in vxlan specifically (geneve
already supports it). For more details, please see individual
patches.

The series requires net to be merged into net-next first to
avoid any further pending merge conflicts.
====================

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