From: Linus Torvalds Date: Wed, 8 Jun 2011 20:54:29 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 X-Git-Tag: firefly_0821_release~7613^2~936 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d21131bb0aa9e2ffbd256c62ee270f3c9a2a9a2c;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: trivial: add space in fsc error message cifs: silence printk when establishing first session on socket CIFS ACL support needs CONFIG_KEYS, so depend on it possible memory corruption in cifs_parse_mount_options() cifs: make CIFS depend on CRYPTO_ECB cifs: fix the kernel release version in the default security warning message --- d21131bb0aa9e2ffbd256c62ee270f3c9a2a9a2c