From: Linus Torvalds Date: Mon, 13 Sep 2010 19:47:08 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 X-Git-Tag: v2.6.36-rc5~41 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ed8f425f546a2242a97f61fabcbe9e50a2559a19;p=~emulex%2Finfiniband.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: cifs: prevent possible memory corruption in cifs_demultiplex_thread cifs: eliminate some more premature cifsd exits cifs: prevent cifsd from exiting prematurely [CIFS] ntlmv2/ntlmssp remove-unused-function CalcNTLMv2_partial_mac_key cifs: eliminate redundant xdev check in cifs_rename Revert "[CIFS] Fix ntlmv2 auth with ntlmssp" Revert "missing changes during ntlmv2/ntlmssp auth and sign" Revert "Eliminate sparse warning - bad constant expression" Revert "[CIFS] Eliminate unused variable warning" --- ed8f425f546a2242a97f61fabcbe9e50a2559a19