Merge uncontroversial parts of branch 'readlink' of git://git.kernel.org/pub/scm...

Pull partial readlink cleanups from Miklos Szeredi.

This is the uncontroversial part of the readlink cleanup patch-set that
simplifies the default readlink handling.

Miklos and Al are still discussing the rest of the series.

* git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
  vfs: make generic_readlink() static
  vfs: remove ".readlink = generic_readlink" assignments
  vfs: default to generic_readlink()
  vfs: replace calling i_op->readlink with vfs_readlink()
  proc/self: use generic_readlink
  ecryptfs: use vfs_get_link()
  bad_inode: add missing i_op initializers

diff --cc Documentation/filesystems/vfs.txt
Simple merge

diff --cc fs/btrfs/inode.c
Simple merge

diff --cc fs/ceph/inode.c
Simple merge

diff --cc fs/f2fs/namei.c
Simple merge

diff --cc fs/fuse/dir.c
Simple merge

diff --cc fs/libfs.c
Simple merge

diff --cc fs/namei.c
Simple merge

diff --cc fs/nfsd/nfs4xdr.c
Simple merge

diff --cc fs/nfsd/vfs.c
Simple merge

diff --cc fs/overlayfs/inode.c
Simple merge

diff --cc fs/proc/inode.c
Simple merge

diff --cc fs/ubifs/file.c
index aa0625f4f6427677f38f8c5d6e177f58572ad05d,a7eae181e1bdd892aa13939c1ccb2db4ec16726b..b0d783774c963c97f32df7649feeb8fb7e4e3e4f
--- 1/fs/ubifs/file.c
--- 2/fs/ubifs/file.c
+++ b/fs/ubifs/file.c
@@@ -1733,8 -1628,7 +1733,7 @@@ const struct inode_operations ubifs_fil
  };
  
  const struct inode_operations ubifs_symlink_inode_operations = {
-       .readlink    = generic_readlink,
 -      .get_link    = simple_get_link,
 +      .get_link    = ubifs_get_link,
        .setattr     = ubifs_setattr,
        .getattr     = ubifs_getattr,
        .listxattr   = ubifs_listxattr,

diff --cc fs/xfs/xfs_ioctl.c
Simple merge

diff --cc fs/xfs/xfs_iops.c
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc mm/shmem.c
Simple merge