Merge branch 'tuntap'
authorDavid S. Miller <davem@davemloft.net>
Wed, 21 Aug 2013 19:21:50 +0000 (12:21 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 21 Aug 2013 19:21:50 +0000 (12:21 -0700)
commite2748d7e930c5ef292b8496d66e546063c825c93
treec17c80f50fc5fa83b350e28ca04630ad738d0213
parent5f1cd200c4e4e1a6bce946aaac40c7a10427f3ed
parent76975e9cb4a7c6fe39478a3dc4dd292a5c6c8c74
Merge branch 'tuntap'

Pavel Emelyanov says:

====================
tun: Some bits required for tun's checkpoint-restore (v2)

After taking a closer look on tun checkpoint-restore I've found several
issues with the tun's API that make it impossible to dump and restore
the state of tun device and attached tun-files.

The proposed API changes are all about extending the existing ioctl-based
stuff. Patches fit today's net-next.

This v2 has David's comments about patch #1 fixed. All the rest is the same.
====================

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