tree a96cec700059896e6b6567be324de63597b3b627
parent d2b4a646717153a1a180b64d4a8464054dbd700e
parent 4fbeb19d53cc3ef2da4bd1fd89a5dc9ac04add3a
author Linus Torvalds <torvalds@linux-foundation.org> 1373394404 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1373394404 -0700

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

Pull third set of VFS updates from Al Viro:
 "Misc stuff all over the place.  There will be one more pile in a
  couple of days"

This is an "evil merge" that also uses the new d_count helper in
fs/configfs/dir.c, missed by commit 84d08fa888e7 ("helper for reading
->d_count")

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  ncpfs: fix error return code in ncp_parse_options()
  locks: move file_lock_list to a set of percpu hlist_heads and convert file_lock_lock to an lglock
  seq_file: add seq_list_*_percpu helpers
  f2fs: fix readdir incorrectness
  mode_t whack-a-mole...
  lustre: kill the pointless wrapper
  helper for reading ->d_count