From: Linus Torvalds Date: Sat, 11 Feb 2017 17:15:58 +0000 (-0800) Subject: Merge branch 'for-linus-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mason... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2b95550a4323e501e133dac1c9c9cad6ff17f4c1;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'for-linus-4.10' of git://git./linux/kernel/git/mason/linux-btrfs Pull btrfs fixes from Chris Mason: "This has two last minute fixes. The highest priority here is a regression fix for the decompression code, but we also fixed up a problem with the 32-bit compat ioctls. The decompression bug could hand back the wrong data on big reads when zlib was used. I have a larger cleanup to make the math here less error prone, but at this stage in the release Omar's patch is the best choice" * 'for-linus-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: btrfs: fix btrfs_decompress_buf2page() btrfs: fix btrfs_compat_ioctl failures on non-compat ioctls --- 2b95550a4323e501e133dac1c9c9cad6ff17f4c1