tree 72b60e6899dfd156b2e9033818f894381da9355c
parent 8908c94d6cd7513ba4512295abc945a6ff7f979c
parent e0d46f5c6e0ba3a79e64cd60e62b7b7191ed93f3
author Linus Torvalds <torvalds@linux-foundation.org> 1463591325 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1463591325 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull remaining vfs xattr work from Al Viro:
 "The rest of work.xattr (non-cifs conversions)"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  btrfs: Switch to generic xattr handlers
  ubifs: Switch to generic xattr handlers
  jfs: Switch to generic xattr handlers
  jfs: Clean up xattr name mapping
  gfs2: Switch to generic xattr handlers
  ceph: kill __ceph_removexattr()
  ceph: Switch to generic xattr handlers
  ceph: Get rid of d_find_alias in ceph_set_acl