| commit | 4d4323ea2dbb506a29260a41b554dfc7de79249e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Aug 25 12:25:38 2013 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Aug 25 12:25:38 2013 -0700 |
| tree | c79ad1c770bd8b44f4afd3e5e4b5745bbdd42a6a | |
| parent | 8495e9c4a9616c9d19f23182d0536485902259db [diff] | |
| parent | 52e220d357a38cb29fa2e29f34ed94c1d66357f4 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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