summaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel/setup.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-06-30 21:40:07 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-06-30 21:40:07 -0700
commit94521ca3dfa6efd4ceb4f6746bf8ead58afb1490 (patch)
treea007eb3eb8a42c2acf828134dde6282c6d1b957d /arch/s390/kernel/setup.c
parent68b4449d79f00dc3cb6ea1f4bf54cf8e453a53c8 (diff)
parent1dfd18d0571231d030f325bfcd80f5c42a56a53e (diff)
downloadop-kernel-dev-94521ca3dfa6efd4ceb4f6746bf8ead58afb1490.zip
op-kernel-dev-94521ca3dfa6efd4ceb4f6746bf8ead58afb1490.tar.gz
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
Pull CIFS/SMB3 updates from Steve French: "Includes two bug fixes, as well as (minimal) support for the new protocol dialect (SMB3.1.1), and support for two ioctls including reflink (duplicate extents) file copy and set integrity" * 'for-next' of git://git.samba.org/sfrench/cifs-2.6: cifs: Unset CIFS_MOUNT_POSIX_PATHS flag when following dfs mounts Update negotiate protocol for SMB3.11 dialect Add ioctl to set integrity Add Get/Set Integrity Information structure definitions Add reflink copy over SMB3.11 with new FSCTL_DUPLICATE_EXTENTS Add SMB3.11 mount option synonym for new dialect add struct FILE_STANDARD_INFO Make dialect negotiation warning message easier to read Add defines and structs for smb3.1 dialect Allow parsing vers=3.11 on cifs mount client MUST ignore EncryptionKeyLength if CAP_EXTENDED_SECURITY is set
Diffstat (limited to 'arch/s390/kernel/setup.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud