diff options
author | 2014-11-23 11:16:36 -0800 | |
---|---|---|
committer | 2014-11-23 11:16:36 -0800 | |
commit | d038a63ace6cf2ce3aeafa741b73d542ffb65163 (patch) | |
tree | 9d7b2bcc203fb3074a1f768fa30b071042690013 /tools/perf/scripts/python/call-graph-from-postgresql.py | |
parent | Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
parent | btrfs: fix lockups from btrfs_clear_path_blocking (diff) | |
download | linux-dev-d038a63ace6cf2ce3aeafa741b73d542ffb65163.tar.xz linux-dev-d038a63ace6cf2ce3aeafa741b73d542ffb65163.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'tools/perf/scripts/python/call-graph-from-postgresql.py')
0 files changed, 0 insertions, 0 deletions