Merge tag '4.14-smb3-xattr-enable' of git://git.samba.org/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Sep 2017 23:06:14 +0000 (16:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Sep 2017 23:06:14 +0000 (16:06 -0700)
commit8dc5b3a6cb2fc5d4f751bda56a378589202a118b
treecae239c16625ecb15ebc4b94535f46ea064bfd47
parent2500e287bca1beb313aa298f2d36be1257cbb483
parent76e752701a8af4404bbd9c45723f7cbd6e4a251e
Merge tag '4.14-smb3-xattr-enable' of git://git.samba.org/sfrench/cifs-2.6

Pull cifs update from Steve French:
 "Enable xattr support for smb3 and also a bugfix"

* tag '4.14-smb3-xattr-enable' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: Check for timeout on Negotiate stage
  cifs: Add support for writing attributes on SMB2+
  cifs: Add support for reading attributes on SMB2+
fs/cifs/cifssmb.c