From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 18 Sep 2014 18:10:35 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6
X-Git-Tag: v3.17-rc6~14
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=d9773ceabfaf3f27b8a36fac035b74ee599df900;p=linux.git

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

Pull cifs/smb3 fixes from Steve French:
 "Fixes for problems found during testing and debugging at the SMB3
  storage test event (plugfest) this week"

* 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
  Fix mfsymlinks file size check
  Update version number displayed by modinfo for cifs.ko
  cifs: remove dead code
  Revert "cifs: No need to send SIGKILL to demux_thread during umount"
  [SMB3] Fix oops when creating symlinks on smb3
  [CIFS] Fix setting time before epoch (negative time values)
---

d9773ceabfaf3f27b8a36fac035b74ee599df900