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

diff --cc fs/btrfs/inode.c
Simple merge

diff --cc fs/ceph/dir.c
Simple merge

diff --cc fs/ceph/inode.c
Simple merge

diff --cc fs/jfs/namei.c
Simple merge

diff --cc fs/ubifs/dir.c
Simple merge

diff --cc fs/ubifs/file.c
Simple merge

diff --cc fs/ubifs/super.c
Simple merge

diff --cc fs/ubifs/ubifs.h
Simple merge