diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-23 02:22:37 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-23 02:22:37 (GMT) |
| commit | ff8d6facda455c129357e891e31dd0aa21a96ed0 (patch) | |
| tree | 04890c770e0429cb08313fc6c99657436099889c /include | |
| parent | 47ef4ad2684d380dd6d596140fb79395115c3950 (diff) | |
| parent | 32f0c4afb4363e31dad49202f1554ba591d649f2 (diff) | |
| download | linux-ff8d6facda455c129357e891e31dd0aa21a96ed0.tar.xz | |
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 'include')
0 files changed, 0 insertions, 0 deletions