diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-27 23:28:09 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-27 23:28:09 +0200 |
| commit | 564884fbdecaea56fb65f2f32963059d3049b967 (patch) | |
| tree | 6b4c330fe381930019ee676be099a3bca87d61ee /net/802/fddi.c | |
| parent | Merge tag 'for-linus-20160527' of git://git.infradead.org/linux-mtd (diff) | |
| parent | blk-mq: clear q->mq_ops if init fail (diff) | |
| download | linux-564884fbdecaea56fb65f2f32963059d3049b967.tar.xz linux-564884fbdecaea56fb65f2f32963059d3049b967.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"A set of fixes that wasn't included in the first merge window pull
request. This pull request contains:
- A set of NVMe fixes from Keith, and one from Nic for the integrity
side of it.
- Fix from Ming, clearing ->mq_ops if we don't successfully setup a
queue for multiqueue.
- A set of stability fixes for bcache from Jiri, and also marking
bcache as orphaned as it's no longer actively maintained (in
mainline, at least)"
* 'for-linus' of git://git.kernel.dk/linux-block:
blk-mq: clear q->mq_ops if init fail
MAINTAINERS: mark bcache as orphan
bcache: bch_gc_thread() is not freezable
bcache: bch_allocator_thread() is not freezable
bcache: bch_writeback_thread() is not freezable
nvme/host: Add missing blk_integrity tag_size + flags assignments
NVMe: Add device ID's with stripe quirk
NVMe: Short-cut removal on surprise hot-unplug
NVMe: Allow user initiated rescan
NVMe: Reduce driver log spamming
NVMe: Unbind driver on failure
NVMe: Delete only created queues
NVMe: Allocate queues only for online cpus
Diffstat (limited to 'net/802/fddi.c')
0 files changed, 0 insertions, 0 deletions