---

yaml
---
r: 155155
b: refs/heads/master
c: b77863b
h: refs/heads/master
i:
  155153: 82b3799
  155151: 0464d43
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3bbeeb3c93a961bd01b969dd4395ecac0c09db8d
+refs/heads/master: b77863bfa153e886f9f8faf1a791ba57a36efed0

trunk/fs/cifs/CHANGES

@@ -5,7 +5,11 @@ client generated ones by default (mount option "serverino" turned
 on by default if server supports it).  Add forceuid and forcegid
 mount options (so that when negotiating unix extensions specifying
 which uid mounted does not immediately force the server's reported
-uids to be overridden).  Add support for scope moutn parm.
+uids to be overridden).  Add support for scope mount parm. Improve
+hard link detection to use same inode for both.  Do not set
+read-only dos attribute on directories (for chmod) since Windows
+explorer special cases this attribute bit for directories for
+a different purpose.
 
 Version 1.58
 ------------

trunk/fs/cifs/cifsfs.h

@@ -113,5 +113,5 @@ extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg);
 extern const struct export_operations cifs_export_ops;
 #endif /* EXPERIMENTAL */
 
-#define CIFS_VERSION   "1.59"
+#define CIFS_VERSION   "1.60"
 #endif				/* _CIFSFS_H */