From: Linus Torvalds Date: Sat, 12 Feb 2011 00:29:50 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 X-Git-Tag: firefly_0821_release~7613^2~2455 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3aec46c1e0be28ead67f53c2cade6453a7fba6e6;p=firefly-linux-kernel-4.4.55.git Merge git://git./linux/kernel/git/sfrench/cifs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: cifs: don't always drop malformed replies on the floor (try #3) cifs: clean up checks in cifs_echo_request [CIFS] Do not send SMBEcho requests on new sockets until SMBNegotiate --- 3aec46c1e0be28ead67f53c2cade6453a7fba6e6