summaryrefslogtreecommitdiff
path: root/arch/mips/include/asm/setup.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-11-08 01:01:47 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-08 01:01:47 +0400
commit8efdf2b759409f85953b84d52a14ea4d39c80474 (patch)
tree237cfcc537fe7840a3c81660740f6073fae63c75 /arch/mips/include/asm/setup.h
parentc224b76b560f3c65f0d10fbb59d3f00379eb0aaf (diff)
parentc481e9feee78c6ce1ba0a1c8c892049f6514f6cf (diff)
downloadlinux-8efdf2b759409f85953b84d52a14ea4d39c80474.tar.xz
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
Diffstat (limited to 'arch/mips/include/asm/setup.h')
0 files changed, 0 insertions, 0 deletions