From: Linus Torvalds Date: Sat, 18 Oct 2014 20:39:19 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6 X-Git-Tag: v5.15~17011 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=9272f2dc3956c6b6c4335de51bc897fa3b981584;p=mirror_ubuntu-kernels.git Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6 Pull cifs/smb3 updates from Steve French: "Improved SMB3 support (symlink and device emulation, and remapping by default the 7 reserved posix characters) and a workaround for cifs mounts to Mac (working around a commonly encountered Mac server bug)" * 'for-linus' of git://git.samba.org/sfrench/cifs-2.6: [CIFS] Remove obsolete comment Check minimum response length on query_network_interface Workaround Mac server problem Remap reserved posix characters by default (part 3/3) Allow conversion of characters in Mac remap range (part 2) Allow conversion of characters in Mac remap range. Part 1 mfsymlinks support for SMB2.1/SMB3. Part 2 query symlink Add mfsymlinks support for SMB2.1/SMB3. Part 1 create symlink Allow mknod and mkfifo on SMB2/SMB3 mounts add defines for two new file attributes --- 9272f2dc3956c6b6c4335de51bc897fa3b981584