diff --git a/[refs] b/[refs]
index 63d2cf967ecb..0974db7ce2f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8ccac0e44934ff9414b31cc3167a5c828afec73
+refs/heads/master: b6fdfdfab0c57d4a62359277c09258bc2f5a1550
diff --git a/trunk/net/l2tp/l2tp_netlink.c b/trunk/net/l2tp/l2tp_netlink.c
index bbba3a19e944..c1bab22db85e 100644
--- a/trunk/net/l2tp/l2tp_netlink.c
+++ b/trunk/net/l2tp/l2tp_netlink.c
@@ -37,6 +37,7 @@ static struct genl_family l2tp_nl_family = {
 	.version	= L2TP_GENL_VERSION,
 	.hdrsize	= 0,
 	.maxattr	= L2TP_ATTR_MAX,
+	.netnsok	= true,
 };
 
 /* Accessed under genl lock */