tree 15b3ea5b89ea7f75965d3ce1c4eba43d69c182c6
parent 7071cf7fc435ab84df872613f613a9a055964fc1
parent 2eb783c43e7cf807a45899c10ed556b6dc116625
author David S. Miller <davem@davemloft.net> 1415042832 -0500
committer David S. Miller <davem@davemloft.net> 1415042832 -0500

Merge branch 'tun-net'

Herbert Xu says:

====================
tun: Fix csum_start and TUN_PKT_STRIP

The first patch fixes a serious problem that breaks checksum offload
in VMs while the second patch fixes a problem that probably affects
no one.
====================

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