diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-21 13:36:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-21 13:36:02 -0800 |
| commit | 2bfedd1d9f470506d98cb5662ced381c38225968 (patch) | |
| tree | c42adc950481ebbc727230bf524ac8575207e628 /fs/nfsd/state.h | |
| parent | a911dcdba190ddf77e9199b9917156f879f42d4b (diff) | |
| parent | decf6d79de84e427d409ff74156af2e77ffadd84 (diff) | |
| download | linux-2bfedd1d9f470506d98cb5662ced381c38225968.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull followup block layer updates from Jens Axboe:
"Two things in this pull request:
- A block throttle oops fix (marked for stable) from Thadeu.
- The NVMe fixes/features queued up for 3.20, but merged later in the
process. From Keith. We should have gotten this merged earlier,
we're ironing out the kinks in the process. Will be ready for the
initial pull next series"
* 'for-linus' of git://git.kernel.dk/linux-block:
blk-throttle: check stats_cpu before reading it from sysfs
NVMe: Fix potential corruption on sync commands
NVMe: Remove unused variables
NVMe: Fix scsi mode select llbaa setting
NVMe: Fix potential corruption during shutdown
NVMe: Asynchronous controller probe
NVMe: Register management handle under nvme class
NVMe: Update SCSI Inquiry VPD 83h translation
NVMe: Metadata format support
Diffstat (limited to 'fs/nfsd/state.h')
0 files changed, 0 insertions, 0 deletions