From: Linus Torvalds <torvalds@linux-foundation.org>
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-Tag: v4.10-rc8~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2b95550a4323e501e133dac1c9c9cad6ff17f4c1;p=platform%2Fkernel%2Flinux-exynos.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