diff --git a/[refs] b/[refs]
index 68e15264ea0b..a5193fb92460 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d34ac199a4af5c678a3a8f3275aeb2586b72da3
+refs/heads/master: 6924c55492c904695f13c552c461c2211f4fdd6a
diff --git a/trunk/fs/locks.c b/trunk/fs/locks.c
index 4a8072736efa..4f2d749ac624 100644
--- a/trunk/fs/locks.c
+++ b/trunk/fs/locks.c
@@ -1600,8 +1600,7 @@ asmlinkage long sys_flock(unsigned int fd, unsigned int cmd)
 /**
  * vfs_test_lock - test file byte range lock
  * @filp: The file to test lock for
- * @fl: The lock to test
- * @conf: Place to return a copy of the conflicting lock, if found
+ * @fl: The lock to test; also used to hold result
  *
  * Returns -ERRNO on failure.  Indicates presence of conflicting lock by
  * setting conf->fl_type to something other than F_UNLCK.