From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 23 Mar 2017 18:39:33 +0000 (-0700)
Subject: Merge branch 'for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mason... 
X-Git-Tag: v4.11-rc4~27
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=131fbf4f9c096adadde27ad4bc70ea1632d720a4;p=platform%2Fkernel%2Flinux-exynos.git

Merge branch 'for-linus-4.11' of git://git./linux/kernel/git/mason/linux-btrfs

Pull btrfs fixes from Chris Mason:
 "Zygo tracked down a very old bug with inline compressed extents.

  I didn't tag this one for stable because I want to do individual
  tested backports. It's a little tricky and I'd rather do some extra
  testing on it along the way"

* 'for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  btrfs: add missing memset while reading compressed inline extents
  Btrfs: fix regression in lock_delalloc_pages
  btrfs: remove btrfs_err_str function from uapi/linux/btrfs.h
---

131fbf4f9c096adadde27ad4bc70ea1632d720a4