From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 28 May 2013 17:08:39 +0000 (-0700)
Subject: Merge branch 'for-3.10' of git://git.samba.org/sfrench/cifs-2.6
X-Git-Tag: v5.15~20018
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=320b34e3e067e08331725df122583afdca10f811;p=mirror_ubuntu-kernels.git

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

Pull CIFS fixes from Steve French:
 "Fixes for a couple of DFS problems, a problem with extended security
  negotiation and two other small cifs fixes"

* 'for-3.10' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: fix composing of mount options for DFS referrals
  cifs: stop printing the unc= option in /proc/mounts
  cifs: fix error handling when calling cifs_parse_devname
  cifs: allow sec=none mounts to work against servers that don't support extended security
  cifs: fix potential buffer overrun when composing a new options string
  cifs: only set ops for inodes in I_NEW state
---

320b34e3e067e08331725df122583afdca10f811