author | Linus Torvalds <torvalds@linux-foundation.org> | |
Mon, 10 Oct 2016 00:29:33 +0000 (17:29 -0700) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Mon, 10 Oct 2016 00:29:33 +0000 (17:29 -0700) | ||
commit | 12e3d3cdd975fe986cc5c35f60b1467a8ec20b80 | |
tree | 14ec935d2e15f454ba69353fcf5329ac67f72e4f | tree | snapshot (tar.xz tar.gz zip) |
parent | 48915c2cbc77eceec2005afb695ac658fede4e0d | commit | diff |
parent | 8ec2ef2b66ea2fd00acc28aca8edaad441dbb424 | commit | diff |
Merge branch 'for-4.9/block-irq' of git://git.kernel.dk/linux-block
Pull blk-mq irq/cpu mapping updates from Jens Axboe:
"This is the block-irq topic branch for 4.9-rc. It's mostly from
Christoph, and it allows drivers to specify their own mappings, and
more importantly, to share the blk-mq mappings with the IRQ affinity
mappings. It's a good step towards making this work better out of the
box"
* 'for-4.9/block-irq' of git://git.kernel.dk/linux-block:
blk_mq: linux/blk-mq.h does not include all the headers it depends on
blk-mq: kill unused blk_mq_create_mq_map()
blk-mq: get rid of the cpumask in struct blk_mq_tags
nvme: remove the post_scan callout
nvme: switch to use pci_alloc_irq_vectors
blk-mq: provide a default queue mapping for PCI device
blk-mq: allow the driver to pass in a queue mapping
blk-mq: remove ->map_queue
blk-mq: only allocate a single mq_map per tag_set
blk-mq: don't redistribute hardware queues on a CPU hotplug event
Pull blk-mq irq/cpu mapping updates from Jens Axboe:
"This is the block-irq topic branch for 4.9-rc. It's mostly from
Christoph, and it allows drivers to specify their own mappings, and
more importantly, to share the blk-mq mappings with the IRQ affinity
mappings. It's a good step towards making this work better out of the
box"
* 'for-4.9/block-irq' of git://git.kernel.dk/linux-block:
blk_mq: linux/blk-mq.h does not include all the headers it depends on
blk-mq: kill unused blk_mq_create_mq_map()
blk-mq: get rid of the cpumask in struct blk_mq_tags
nvme: remove the post_scan callout
nvme: switch to use pci_alloc_irq_vectors
blk-mq: provide a default queue mapping for PCI device
blk-mq: allow the driver to pass in a queue mapping
blk-mq: remove ->map_queue
blk-mq: only allocate a single mq_map per tag_set
blk-mq: don't redistribute hardware queues on a CPU hotplug event
13 files changed:
block/Kconfig | diff1 | | diff2 | | blob | history |
block/blk-mq-tag.c | diff1 | | diff2 | | blob | history |
block/blk-mq-tag.h | diff1 | | diff2 | | blob | history |
block/blk-mq.c | diff1 | | diff2 | | blob | history |
block/blk-mq.h | diff1 | | diff2 | | blob | history |
drivers/block/nbd.c | diff1 | | diff2 | | blob | history |
drivers/block/null_blk.c | diff1 | | diff2 | | blob | history |
drivers/md/dm-rq.c | diff1 | | diff2 | | blob | history |
drivers/nvme/host/core.c | diff1 | | diff2 | | blob | history |
drivers/nvme/host/nvme.h | diff1 | | diff2 | | blob | history |
drivers/nvme/host/pci.c | diff1 | | diff2 | | blob | history |
drivers/nvme/host/rdma.c | diff1 | | diff2 | | blob | history |
include/linux/blk-mq.h | diff1 | | diff2 | | blob | history |