commit 7d1419f30cc5106196e54a282d7e115e698c95f6 Merge: ee042ec 1209bbd Author: Linus Torvalds Date: Fri Oct 3 13:09:57 2014 -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