From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 28 Apr 2017 17:13:17 +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~7
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=28b2013587e535cef8bd8d8e0eae5ad40868369b

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

Pull btrfs fix from Chris Mason:
 "We have one more fix for btrfs.

  This gets rid of a new WARN_ON from rc1 that ended up making more
  noise than we really want. The larger fix for the underflow got
  delayed a bit and it's better for now to put it under
  CONFIG_BTRFS_DEBUG"

* 'for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  btrfs: qgroup: move noisy underflow warning to debugging build
---

28b2013587e535cef8bd8d8e0eae5ad40868369b