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)
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>

Trivial merge