Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Feb 2016 18:52:59 +0000 (10:52 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Feb 2016 18:52:59 +0000 (10:52 -0800)
commit65c23c65bee479faceb042a52f5a7278dfa8d972
treeb71c4020fb7a90d04594116c7168dc063df1dacd
parentd82834ee13e8060bd20c7d3b834d2ac5ff89469a
parent4b550af519854421dfec9f7732cdddeb057134b2
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