From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 16 Feb 2016 18:52:59 +0000 (-0800)
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=65c23c65bee479faceb042a52f5a7278dfa8d972;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 small set of cifs fixes.

  I am still reviewing some more, recently submitted SMB3 fixes, but
  these three are small and safe and ready now"

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: fix erroneous return value
  cifs: fix potential overflow in cifs_compose_mount_options
  cifs: remove redundant check for null string pointer
---

65c23c65bee479faceb042a52f5a7278dfa8d972