Merge branch 'next' into for-linus

Prepare input updates for 3.16.

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/kobject.c b/lib/kobject.c
index cb14aeac4cca..58751bb80a7c 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -94,7 +94,7 @@ static int create_dir(struct kobject *kobj)
                 BUG_ON(ops->type >= KOBJ_NS_TYPES);
                 BUG_ON(!kobj_ns_type_registered(ops->type));
 
-                kernfs_enable_ns(kobj->sd);
+                sysfs_enable_ns(kobj->sd);
         }
 
         return 0;