diff --git a/[refs] b/[refs]
index c2e1c822f36d..7563676a6e8e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b91e2661addd8e2419cb45f6a322aa5dab9bcee
+refs/heads/master: 5bd9052d79daa4c8beb45436c408b6de672adb82
diff --git a/trunk/fs/cifs/CHANGES b/trunk/fs/cifs/CHANGES
index 92888aa90749..651cefde385b 100644
--- a/trunk/fs/cifs/CHANGES
+++ b/trunk/fs/cifs/CHANGES
@@ -1,3 +1,9 @@
+Version 1.60
+-------------
+Fix memory leak in reconnect.  Fix oops in DFS mount error path.
+Set s_maxbytes to smaller (the max that vfs can handle) so that
+sendfile will now work over cifs mounts again.
+
 Version 1.59
 ------------
 Client uses server inode numbers (which are persistent) rather than