OSDN Git Service

Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 May 2016 17:01:47 +0000 (10:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 May 2016 17:01:47 +0000 (10:01 -0700)
Pull cifs updates from Steve French:
 "Various small CIFS and SMB3 fixes (including some for stable)"

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
  remove directory incorrectly tries to set delete on close on non-empty directories
  Update cifs.ko version to 2.09
  fs/cifs: correctly to anonymous authentication for the NTLM(v2) authentication
  fs/cifs: correctly to anonymous authentication for the NTLM(v1) authentication
  fs/cifs: correctly to anonymous authentication for the LANMAN authentication
  fs/cifs: correctly to anonymous authentication via NTLMSSP
  cifs: remove any preceding delimiter from prefix_path
  cifs: Use file_dentry()

1  2 
fs/cifs/cifsfs.h
fs/cifs/connect.c
fs/cifs/file.c

Simple merge
Simple merge
diff --cc fs/cifs/file.c
Simple merge