projects / linux / .git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cb95413 f82c458)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 23 Nov 2014 19:16:36 +0000 (11:16 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 23 Nov 2014 19:16:36 +0000 (11:16 -0800)
commitd038a63ace6cf2ce3aeafa741b73d542ffb65163
tree9d7b2bcc203fb3074a1f768fa30b071042690013tree | snapshot
parentcb95413971d605b0d152d3ceecc47ba8991d66fbcommit | diff
parentf82c458a2c3ffb94b431fc6ad791a79df1b3713ecommit | diff
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
https://github.com/torvalds/linux.git