From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 5 Oct 2013 03:50:16 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6
X-Git-Tag: v3.12-rc4~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a5c984cc2986c3ed88615fec01e433f9019ff011;p=profile%2Fivi%2Fkernel-x86-ivi.git

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

Pull CIFS fixes from Steve French:
 "Small set of cifs fixes.  Most important is Jeff's fix that works
  around disconnection problems which can be caused by simultaneous use
  of user space tools (starting a long running smbclient backup then
  doing a cifs kernel mount) or multiple cifs mounts through a NAT, and
  Jim's fix to deal with reexport of cifs share.

  I expect to send two more cifs fixes next week (being tested now) -
  fixes to address an SMB2 unmount hang when server dies and a fix for
  cifs symlink handling of Windows "NFS" symlinks"

* 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
  [CIFS] update cifs.ko version
  [CIFS] Remove ext2 flags that have been moved to fs.h
  [CIFS] Provide sane values for nlink
  cifs: stop trying to use virtual circuits
  CIFS: FS-Cache: Uncache unread pages in cifs_readpages() before freeing them
---

a5c984cc2986c3ed88615fec01e433f9019ff011