From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 12 Nov 2007 19:11:39 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
X-Git-Tag: v2.6.24-rc3~156
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=46015977e70f672ae6b20a1b5fb1e361208365ba;p=karo-tx-linux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: (21 commits)
  [CIFS] fix oops on second mount to same server when null auth is used
  [CIFS] Fix stale mode after readdir when cifsacl specified
  [CIFS] add mode to acl conversion helper function
  [CIFS] Fix incorrect mode when ACL had deny access control entries
  [CIFS] Add uid to key description so krb can handle user mounts
  [CIFS] Fix walking out end of cifs dacl
  [CIFS] Add upcall files for cifs to use spnego/kerberos
  [CIFS] add OIDs for KRB5 and MSKRB5 to ASN1 parsing routines
  [CIFS] Register and unregister cifs_spnego_key_type on module init/exit
  [CIFS] implement upcalls for SPNEGO blob via keyctl API
  [CIFS] allow cifs_calc_signature2 to deal with a zero length iovec
  [CIFS] If no Access Control Entries, set mode perm bits to zero
  [CIFS] when mount helper missing fix slash wrong direction in share
  [CIFS] Don't request too much permission when reading an ACL
  [CIFS] enable get mode from ACL when cifsacl mount option specified
  [CIFS] ACL support part 8
  [CIFS] acl support part 7
  [CIFS] acl support part 6
  [CIFS] acl support part 6
  [CIFS] remove unused funtion compile warning when experimental off
  ...
---

46015977e70f672ae6b20a1b5fb1e361208365ba
diff --cc fs/cifs/cifsfs.h
index 5574ba3ab1f9,62357d228c07..2a21dc66f0de
--- a/fs/cifs/cifsfs.h
+++ b/fs/cifs/cifsfs.h
@@@ -103,8 -103,8 +103,8 @@@ extern int cifs_ioctl(struct inode *ino
  		       unsigned int command, unsigned long arg);
  
  #ifdef CONFIG_CIFS_EXPERIMENTAL
 -extern struct export_operations cifs_export_ops;
 +extern const struct export_operations cifs_export_ops;
  #endif /* EXPERIMENTAL */
  
- #define CIFS_VERSION   "1.51"
+ #define CIFS_VERSION   "1.52"
  #endif				/* _CIFSFS_H */