tree 2b342f50dd0d585ce34c08e68cd6d1fcd4ddae40
parent f2899788353c13891412b273fdff5f02d49aa40f
parent 2836b4f224d4fd7d1a2b23c3eecaf0f0ae199a74
author David S. Miller <davem@davemloft.net> 1495657642 -0400
committer David S. Miller <davem@davemloft.net> 1495657642 -0400

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>