Merge branch 'nsfs' into for-next

1 files changed, 2 insertions, 1 deletions

diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index e0d64667a4b3..2e8756b8c775 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -26,6 +26,7 @@
 #endif
 #include <net/netns/nftables.h>
 #include <net/netns/xfrm.h>
+#include <linux/ns_common.h>
 
 struct user_namespace;
 struct proc_dir_entry;
@@ -60,7 +61,7 @@ struct net {
 
         struct user_namespace   *user_ns;       /* Owning user namespace */
 
-        unsigned int            proc_inum;
+        struct ns_common        ns;
 
         struct proc_dir_entry   *proc_net;
         struct proc_dir_entry   *proc_net_stat;