tree 2a24412b734c6e7911ef4268ed3b52750b3cdf75
parent 8f98bcdf8f9638ee012ff09c6c8732e0fda6018a
parent 4afe260bab50290a05e5732570329a530ed023f3
author Linus Torvalds <torvalds@linux-foundation.org> 1432760956 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1432760956 -0700

Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

Pull cifs fixes from Steve French:
 "Back from SambaXP - now have 8 small CIFS bug fixes to merge"

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
  CIFS: Fix race condition on RFC1002_NEGATIVE_SESSION_RESPONSE
  Fix to convert SURROGATE PAIR
  cifs: potential missing check for posix_lock_file_wait
  Fix to check Unique id and FileType when client refer file directly.
  CIFS: remove an unneeded NULL check
  [cifs] fix null pointer check
  Fix that several functions handle incorrect value of mapchars
  cifs: Don't replace dentries for dfs mounts