diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-23 11:22:37 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-23 11:22:37 +0900 |
| commit | ff8d6facda455c129357e891e31dd0aa21a96ed0 (patch) | |
| tree | 04890c770e0429cb08313fc6c99657436099889c /tools/perf/scripts/python/sctop.py | |
| parent | Merge tag 'for-linus-20160715' of git://git.infradead.org/linux-mtd (diff) | |
| parent | nvme: Remove RCU namespace protection (diff) | |
| download | wireguard-linux-ff8d6facda455c129357e891e31dd0aa21a96ed0.tar.xz wireguard-linux-ff8d6facda455c129357e891e31dd0aa21a96ed0.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull NVMe fix from Jens Axboe:
"Late addition here, it's basically a revert of a patch that was added
in this merge window, but has proven to cause problems.
This is swapping out the RCU based namespace protection with a good
old mutex instead"
* 'for-linus' of git://git.kernel.dk/linux-block:
nvme: Remove RCU namespace protection
Diffstat (limited to 'tools/perf/scripts/python/sctop.py')
0 files changed, 0 insertions, 0 deletions