From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 1 Aug 2015 00:05:37 +0000 (-0700)
Subject: Merge branch 'for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=acea568fa9eaeffbf949d15b2f7c9c346e16aae3;p=deliverable%2Flinux.git

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

Pull btrfs fixes from Chris Mason:
 "Filipe fixed up a hard to trigger ENOSPC regression from our merge
  window pull, and we have a few other smaller fixes"

* 'for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: fix quick exhaustion of the system array in the superblock
  btrfs: its btrfs_err() instead of btrfs_error()
  btrfs: Avoid NULL pointer dereference of free_extent_buffer when read_tree_block() fail
  btrfs: Fix lockdep warning of btrfs_run_delayed_iputs()
---

acea568fa9eaeffbf949d15b2f7c9c346e16aae3