From: David S. Miller <davem@davemloft.net>
Date: Wed, 21 Aug 2013 19:21:50 +0000 (-0700)
Subject: Merge branch 'tuntap'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e2748d7e930c5ef292b8496d66e546063c825c93;p=linux-beck.git

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

e2748d7e930c5ef292b8496d66e546063c825c93