diff --git a/[refs] b/[refs]
index 509463ff80d2..5141e8b48585 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 314dd2a05340fffbe217c5e40ec6c3bd1d07bf89
+refs/heads/master: 269cddd44e3588d1c50a7ec055b78de4d6c72cb6
diff --git a/trunk/include/linux/dlm.h b/trunk/include/linux/dlm.h
index 0b3518c42356..d4e02f5353a0 100644
--- a/trunk/include/linux/dlm.h
+++ b/trunk/include/linux/dlm.h
@@ -48,10 +48,10 @@ typedef void dlm_lockspace_t;
  *
  * 0 if lock request was successful
  * -EAGAIN if request would block and is flagged DLM_LKF_NOQUEUE
- * -ENOMEM if there is no memory to process request
- * -EINVAL if there are invalid parameters
  * -DLM_EUNLOCK if unlock request was successful
  * -DLM_ECANCEL if a cancel completed successfully
+ * -EDEADLK if a deadlock was detected
+ * -ETIMEDOUT if the lock request was canceled due to a timeout
  */
 
 #define DLM_SBF_DEMOTED		0x01