From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 25 Aug 2013 19:25:38 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Tag: firefly_0821_release~176^2~5509
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4d4323ea2dbb506a29260a41b554dfc7de79249e;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs

Pull vfs fixes from Al Viro:
 "Assorted fixes from the last week or so"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  VFS: collect_mounts() should return an ERR_PTR
  bfs: iget_locked() doesn't return an ERR_PTR
  efs: iget_locked() doesn't return an ERR_PTR()
  proc: kill the extra proc_readfd_common()->dir_emit_dots()
  cope with potentially long ->d_dname() output for shmem/hugetlb
---

4d4323ea2dbb506a29260a41b554dfc7de79249e