tree 55ae51e8817e674e929a395f1c99c072ebba942f
parent ee042ec88022249b848306dd6e87ffd2fd88a839
parent 1209bbdff2f6bbffa6eb5823033bbd7b8799a5e2
author Linus Torvalds <torvalds@linux-foundation.org> 1412366997 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1412366997 -0700

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

Pull cifs/smb3 fixes from Steve French:
 "Fix for CIFS/SMB3 oops on reconnect during readpages (3.17 regression)
  and for incorrectly closing file handle in symlink error cases"

* 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
  CIFS: Fix readpages retrying on reconnects
  Fix problem recognizing symlinks