commit 28b2013587e535cef8bd8d8e0eae5ad40868369b
author Linus Torvalds <torvalds@linux-foundation.org> Fri Apr 28 10:13:17 2017 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Fri Apr 28 10:13:17 2017 -0700
tree 80b07dfce29e4e94e37660c47a621c368c05a6e8
parent 8b5d11e4b095450e2f259d5f60ea18c13d2fe0a2
parent 338bd52f3c3a86a1feea8c9a121d1cee60d68d69

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