From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 23 Nov 2014 19:16:36 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=d038a63ace6cf2ce3aeafa741b73d542ffb65163;p=deliverable%2Flinux.git

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

Pull btrfs deadlock fix from Chris Mason:
 "This has a fix for a long standing deadlock that we've been trying to
  nail down for a while.  It ended up being a bad interaction with the
  fair reader/writer locks and the order btrfs reacquires locks in the
  btree"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  btrfs: fix lockups from btrfs_clear_path_blocking
---

d038a63ace6cf2ce3aeafa741b73d542ffb65163