diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-07 01:38:33 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-07 01:38:33 +0400 |
| commit | 2110cf029a67237db572299bb51e0de9e3e3d4dd (patch) | |
| tree | 6837ff139a807037f06952c3eb72c3e350bc05c8 /tools/perf/scripts/python/sctop.py | |
| parent | 1589a3e7777631ff56dd58cd7dcdf275185e62b5 (diff) | |
| parent | 1383923d1985cef2bceb8128094fbe5e05de7435 (diff) | |
| download | linux-2110cf029a67237db572299bb51e0de9e3e3d4dd.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block layer updates from Jens Axboe:
"I've got a few bits pending for 3.8 final, that I better get sent out.
It's all been sitting for a while, I consider it safe.
It contains:
- Two bug fixes for mtip32xx, fixing a driver hang and a crash.
- A few-liner protocol error fix for drbd.
- A few fixes for the xen block front/back driver, fixing a potential
data corruption issue.
- A race fix for disk_clear_events(), causing spurious warnings. Out
of the Chrome OS base.
- A deadlock fix for disk_clear_events(), moving it to the a
unfreezable workqueue. Also from the Chrome OS base."
* 'for-linus' of git://git.kernel.dk/linux-block:
drbd: fix potential protocol error and resulting disconnect/reconnect
mtip32xx: fix for crash when the device surprise removed during rebuild
mtip32xx: fix for driver hang after a command timeout
block: prevent race/cleanup
block: remove deadlock in disk_clear_events
xen-blkfront: handle bvecs with partial data
llist/xen-blkfront: implement safe version of llist_for_each_entry
xen-blkback: implement safe iterator for the list of persistent grants
Diffstat (limited to 'tools/perf/scripts/python/sctop.py')
0 files changed, 0 insertions, 0 deletions