Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Oct 2014 20:09:57 +0000 (13:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Oct 2014 20:09:57 +0000 (13:09 -0700)
commit7d1419f30cc5106196e54a282d7e115e698c95f6
tree55ae51e8817e674e929a395f1c99c072ebba942f
parentee042ec88022249b848306dd6e87ffd2fd88a839
parent1209bbdff2f6bbffa6eb5823033bbd7b8799a5e2
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