You can pull the following file-locking changes from:
  git://linux-nfs.org/~bfields/linux.git locks
Cleanup, minor bugfixes and some documentation patches.  They've been in

-mm for a while.
(By the way, I've also started some very primitive lease and flock

tests, available from:
	git://linux-nfs.org/~bfields/lock-tests.git
and I'm mainly depending on those and connectathon locking tests for

now.)
--b.
J. Bruce Fields (7):

      locks: reverse order of posix_locks_conflict() arguments

      locks: kill redundant local variable

      locks: fix flock_lock_file() comment

      Documentation: move mandatory locking documentation to filesystems/

      locks: add warning about mandatory locking races

      Documentation: move locks.txt in filesystems/

      nfsd: remove IS_ISMNDLCK macro
Matthias Kaehlcke (1):

      fs/locks.c: use list_for_each_entry() instead of list_for_each()
Pavel Emelyanov (9):

      Memory shortage can result in inconsistent flocks state

      Use list_first_entry in locks_wake_up_blocks

      locks: Fix potential OOPS in generic_setlease()

      Cleanup macros for distinguishing mandatory locks

      GFS2: clean up explicit check for mandatory locks

      9PFS: clean up explicit check for mandatory locks

      AFS: clean up explicit check for mandatory locks

      NFS: clean up explicit check for mandatory locks

      Rework /proc/locks via seq_files and seq_list helpers
 Documentation/00-INDEX                             |    6 +-

 Documentation/filesystems/00-INDEX                 |    4 +

 Documentation/{ => filesystems}/locks.txt          |   10 +-

 .../mandatory-locking.txt}                         |   21 ++-

 fs/9p/vfs_file.c                                   |    2 +-

 fs/afs/flock.c                                     |    3 +-

 fs/gfs2/ops_file.c                                 |    4 +-

 fs/locks.c                                         |  192 +++++++++-----------

 fs/nfs/file.c                                      |    3 ...
[ message continues ]