projects / linux-2.6-block.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 820c687 a9ae008)
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)
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

1  2 
fs/cifs/cifsfs.c patch | diff1 | diff2 | blob | history
fs/cifs/cifssmb.c patch | diff1 | diff2 | blob | history

diff --cc fs/cifs/cifsfs.c
Simple merge
diff --cc fs/cifs/cifssmb.c
Simple merge
Linux 6.x block layer and io_uring tree(s)