Merge branch 'for-cifs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 May 2016 21:35:45 +0000 (14:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 May 2016 21:35:45 +0000 (14:35 -0700)
commit681750c0468185f92acb8080c13f26a19cb4ee0d
tree978ccd07546001c0e891b1bfac405fe9263ba0fe
parent820c687b70ae2c72972240b83c053cb7c85ddbc3
parenta9ae008f407b50fc92ef19588d2ea2be13a7f5e2
Merge branch 'for-cifs' of git://git./linux/kernel/git/viro/vfs

Pull cifs xattr updates from Al Viro:
 "This is the remaining parts of the xattr work - the cifs bits"

* 'for-cifs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  cifs: Switch to generic xattr handlers
  cifs: Fix removexattr for os2.* xattrs
  cifs: Check for equality with ACL_TYPE_ACCESS and ACL_TYPE_DEFAULT
  cifs: Fix xattr name checks
fs/cifs/cifsfs.c
fs/cifs/cifssmb.c