diff --git a/[refs] b/[refs]
index 8cd827e0db90..303a30291fcb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5132861a7a44498ebb18357473f8b8d4cdc70e9f
+refs/heads/master: dbdbb87636e882042cbe53d5d4eac94206f8db83
diff --git a/trunk/fs/cifs/CHANGES b/trunk/fs/cifs/CHANGES
index 28e3d5c5fcac..1f3465201fdf 100644
--- a/trunk/fs/cifs/CHANGES
+++ b/trunk/fs/cifs/CHANGES
@@ -2,6 +2,11 @@ Version 1.53
 ------------
 DFS support added (Microsoft Distributed File System client support needed
 for referrals which enable a hierarchical name space among servers).
+Disable temporary caching of mode bits to servers which do not support
+storing of mode (e.g. Windows servers, when client mounts without cifsacl
+mount option) and add new "dynperm" mount option to enable temporary caching
+of mode (enable old behavior).  Fix hang on mount caused when server crashes
+tcp session during negotiate protocol.
 
 Version 1.52
 ------------
diff --git a/trunk/fs/cifs/connect.c b/trunk/fs/cifs/connect.c
index d49e274f8eba..e8fa46c7cff2 100644
--- a/trunk/fs/cifs/connect.c
+++ b/trunk/fs/cifs/connect.c
@@ -653,6 +653,7 @@ cifs_demultiplex_thread(struct TCP_Server_Info *server)
 	spin_lock(&GlobalMid_Lock);
 	server->tcpStatus = CifsExiting;
 	spin_unlock(&GlobalMid_Lock);
+	wake_up_all(&server->response_q);
 
 	/* don't exit until kthread_stop is called */
 	set_current_state(TASK_UNINTERRUPTIBLE);