From: Linus Torvalds Date: Sun, 15 May 2011 17:22:10 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=eed631e0d741d1a1067cfc6d709fdf2363126f9c;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge git://git./linux/kernel/git/mason/btrfs-unstable * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: Btrfs: fix FS_IOC_SETFLAGS ioctl Btrfs: fix FS_IOC_GETFLAGS ioctl fs: remove FS_COW_FL Btrfs: fix easily get into ENOSPC in mixed case Prevent oopsing in posix_acl_valid() --- eed631e0d741d1a1067cfc6d709fdf2363126f9c