tree a76baf52612b90c4da8c4ac3c430d483fbbb1d79
parent f341d9f08ae01d90d8d0c135ae2edf4423e724c9
parent e1699d2d7bf6e6cce3e1baff19f9dd4595a58664
author Linus Torvalds <torvalds@linux-foundation.org> 1490294373 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1490294373 -0700

Merge branch 'for-linus-4.11' of git://git.kernel.org/pub/scm/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