Merge branch 'q-in-q-checksums'
authorDavid S. Miller <davem@davemloft.net>
Wed, 24 May 2017 20:27:22 +0000 (16:27 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 24 May 2017 20:27:22 +0000 (16:27 -0400)
commite6a88e4ba88f3dd9d772f0ff7a88837939264883
tree2b342f50dd0d585ce34c08e68cd6d1fcd4ddae40
parentf2899788353c13891412b273fdff5f02d49aa40f
parent2836b4f224d4fd7d1a2b23c3eecaf0f0ae199a74
Merge branch 'q-in-q-checksums'

Daniel Borkmann says:

====================
BPF pruning follow-up

Follow-up to fix incorrect pruning when alignment tracking is
in use and to properly clear regs after call to not leave stale
data behind. For details, please see individual patches.
====================

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