From: David S. Miller Date: Wed, 21 Aug 2013 19:21:50 +0000 (-0700) Subject: Merge branch 'tuntap' X-Git-Tag: v3.12-rc1~132^2~219 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e2748d7e930c5ef292b8496d66e546063c825c93;p=platform%2Fkernel%2Flinux-exynos.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 --- e2748d7e930c5ef292b8496d66e546063c825c93