From: Linus Torvalds Date: Wed, 10 Dec 2014 23:37:51 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a6b849578ef3e0b131b1ea4063473a4f935a65e9;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6 Pull cifs update from Steve French: "Mostly cifs cleanup but also a few cifs fixes" * 'for-linus' of git://git.samba.org/sfrench/cifs-2.6: cifs: remove unneeded condition check Set UID in sess_auth_rawntlmssp_authenticate too cifs: convert printk(LEVEL...) to pr_ cifs: convert to print_hex_dump() instead of custom implementation cifs: call strtobool instead of custom implementation Update MAINTAINERS entry Update modinfo cifs version for cifs.ko decode_negTokenInit had wrong calling sequence Add missing defines for ACL query support Add support for original fallocate --- a6b849578ef3e0b131b1ea4063473a4f935a65e9