From: Linus Torvalds Date: Mon, 12 Aug 2013 22:02:53 +0000 (-0700) Subject: Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=584d88b2cd3b60507e708d2452651e4d3caa1b81;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 Pull CIFS fixes from Steve French: "A set of small cifs fixes, including 3 relating to symlink handling" * 'for-next' of git://git.samba.org/sfrench/cifs-2.6: cifs: don't instantiate new dentries in readdir for inodes that need to be revalidated immediately cifs: set sb->s_d_op before calling d_make_root() cifs: fix bad error handling in crypto code cifs: file: initialize oparms.reconnect before using it Do not attempt to do cifs operations reading symlinks with SMB2 cifs: extend the buffer length enought for sprintf() using --- 584d88b2cd3b60507e708d2452651e4d3caa1b81