Merge 3.14-rc5 into driver-core-next

We want the fixes in here.

diff --cc drivers/base/dma-buf.c
Simple merge

diff --cc drivers/base/firmware_class.c
Simple merge

diff --cc fs/kernfs/mount.c
Simple merge

diff --cc fs/sysfs/mount.c
Simple merge

diff --cc include/linux/kernfs.h
index 649497a56a95b2f85b5cc1763d5455f9fa6ab633,d267623c28cfdaa385ab5f288683c0157f9e8ef4..09669d09274857e4e950438151f4d095b467140e
--- 1/include/linux/kernfs.h
--- 2/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 */