From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 3 Mar 2014 04:09:08 +0000 (-0800)
Subject: Merge 3.14-rc5 into driver-core-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=13df7977431e3b906a23bb75f29e0f40a8d73f87;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge 3.14-rc5 into driver-core-next

We want the fixes in here.
---

13df7977431e3b906a23bb75f29e0f40a8d73f87
diff --cc include/linux/kernfs.h
index 649497a56a95,d267623c28cf..09669d092748
--- a/include/linux/kernfs.h
+++ b/include/linux/kernfs.h
@@@ -421,18 -367,11 +422,18 @@@ static inline int kernfs_remove_by_name
  	return kernfs_remove_by_name_ns(parent, name, NULL);
  }
  
 +static inline int kernfs_rename(struct kernfs_node *kn,
 +				struct kernfs_node *new_parent,
 +				const char *new_name)
 +{
 +	return kernfs_rename_ns(kn, new_parent, new_name, NULL);
 +}
 +
  static inline struct dentry *
  kernfs_mount(struct file_system_type *fs_type, int flags,
- 	     struct kernfs_root *root)
+ 	     struct kernfs_root *root, bool *new_sb_created)
  {
- 	return kernfs_mount_ns(fs_type, flags, root, NULL);
+ 	return kernfs_mount_ns(fs_type, flags, root, new_sb_created, NULL);
  }
  
  #endif	/* __LINUX_KERNFS_H */