linux-next: manual merge of the vfs tree with the btrfs tree

Hi all, Today's linux-next merge of the vfs tree got a conflict in: fs/btrfs/ioctl.c between commit: 2911da32d543 ("btrfs: use btrfs_inode_lock/btrfs_inode_unlock inode lock helpers") from the btrfs tree and commit: d9b32b140987 ("btrfs: convert to fileattr") from the vfs tree. I fix

linux-next: manual merge of the vfs tree with the btrfs tree

Hi Al, Today's linux-next merge of the vfs tree got a conflict in fs/btrfs/xattr.c between commit 3c3b04d10ff1 ("btrfs: don't accept bare namespace as a valid xattr") from the btrfs tree and commit 5dd3dc06371a ("VFS: normal filesystems (and lustre): d_inode() annotations") from the vfs tree. I f