From: Linus Torvalds Date: Thu, 7 Nov 2013 21:01:47 +0000 (+0900) Subject: Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6 X-Git-Tag: firefly_0821_release~176^2~5054 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8efdf2b759409f85953b84d52a14ea4d39c80474;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6 Pull CIFS updates from Steve French: "Includes a couple of fixes, plus changes to make multiplex identifiers easier to read and correlate with network traces, and a set of enhancements for SMB3 dialect. Also adds support for per-file compression for both cifs and smb2/smb3 ("chattr +c filename). Should have at least one other merge request ready by next week with some new SMB3 security features and copy offload support" * 'for-linus' of git://git.samba.org/sfrench/cifs-2.6: Query network adapter info at mount time for debugging Fix unused variable warning when CIFS POSIX disabled Allow setting per-file compression via CIFS protocol Query File System Alignment Query device characteristics at mount time from server on SMB2/3 not just on cifs mounts cifs: Send a logoff request before removing a smb session cifs: Make big endian multiplex ID sequences monotonic on the wire cifs: Remove redundant multiplex identifier check from check_smb_hdr() Query file system attributes from server on SMB2, not just cifs, mounts Allow setting per-file compression via SMB2/3 Fix corrupt SMB2 ioctl requests --- 8efdf2b759409f85953b84d52a14ea4d39c80474