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

diff --cc block/Kconfig
Simple merge

diff --cc block/blk-mq-tag.c
index cef618f6fc92132a640b4d16720f53f9dff5f712,2eae3d5f7145bbc32f2c82d1c85f7b8f2938370c..dcf5ce3ba4bff3068486d8596c5941e9f382d228
--- 1/block/blk-mq-tag.c
--- 2/block/blk-mq-tag.c
+++ b/block/blk-mq-tag.c
@@@ -412,9 -673,8 +406,8 @@@ struct blk_mq_tags *blk_mq_init_tags(un
  
  void blk_mq_free_tags(struct blk_mq_tags *tags)
  {
 -      bt_free(&tags->bitmap_tags);
 -      bt_free(&tags->breserved_tags);
 +      sbitmap_queue_free(&tags->bitmap_tags);
 +      sbitmap_queue_free(&tags->breserved_tags);
-       free_cpumask_var(tags->cpumask);
        kfree(tags);
  }
  

diff --cc block/blk-mq-tag.h
index 09f4cc0aaa84c9d7e83da2c86277c09693f07afe,556964134d1c6809590b68553d90faaa58d0284b..d1662734dc539d866f9edcd48f155e2465f63942
--- 1/block/blk-mq-tag.h
--- 2/block/blk-mq-tag.h
+++ b/block/blk-mq-tag.h
@@@ -17,8 -42,8 +17,6 @@@ struct blk_mq_tags 
  
        struct request **rqs;
        struct list_head page_list;
--
-       cpumask_var_t cpumask;
 -      int alloc_policy;
  };
  
  

diff --cc block/blk-mq.c
index dc5f47f6093166f09d9c875aae79db2031e41acf,f1c5263c44e857cdfabe85f45a97fb89c485674d..b65f572a4faf129a438f0a5e104f3e3a332894df
--- 1/block/blk-mq.c
--- 2/block/blk-mq.c
+++ b/block/blk-mq.c
@@@ -224,11 -245,21 +224,11 @@@ struct request *blk_mq_alloc_request(st
                return ERR_PTR(ret);
  
        ctx = blk_mq_get_ctx(q);
-       hctx = q->mq_ops->map_queue(q, ctx->cpu);
+       hctx = blk_mq_map_queue(q, ctx->cpu);
        blk_mq_set_alloc_data(&alloc_data, q, flags, ctx, hctx);
 -
        rq = __blk_mq_alloc_request(&alloc_data, rw, 0);
 -      if (!rq && !(flags & BLK_MQ_REQ_NOWAIT)) {
 -              __blk_mq_run_hw_queue(hctx);
 -              blk_mq_put_ctx(ctx);
 -
 -              ctx = blk_mq_get_ctx(q);
 -              hctx = blk_mq_map_queue(q, ctx->cpu);
 -              blk_mq_set_alloc_data(&alloc_data, q, flags, ctx, hctx);
 -              rq =  __blk_mq_alloc_request(&alloc_data, rw, 0);
 -              ctx = alloc_data.ctx;
 -      }
        blk_mq_put_ctx(ctx);
 +
        if (!rq) {
                blk_queue_exit(q);
                return ERR_PTR(-EWOULDBLOCK);

diff --cc block/blk-mq.h
Simple merge

diff --cc drivers/block/nbd.c
index ccfcfc11399abd98c7cd6cf4f72725a78cd023b9,4c6dd1a85eade5affc3baff9a2470b7e3d312b45..ba405b55329fb7d784213ea582eae429f05c2bc2
--- 1/drivers/block/nbd.c
--- 2/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@@ -881,7 -881,7 +881,6 @@@ static int nbd_init_request(void *data
  
  static struct blk_mq_ops nbd_mq_ops = {
        .queue_rq       = nbd_queue_rq,
--      .map_queue      = blk_mq_map_queue,
        .init_request   = nbd_init_request,
        .timeout        = nbd_xmit_timeout,
  };

diff --cc drivers/block/null_blk.c
Simple merge

diff --cc drivers/md/dm-rq.c
Simple merge

diff --cc drivers/nvme/host/core.c
Simple merge

diff --cc drivers/nvme/host/nvme.h
Simple merge

diff --cc drivers/nvme/host/pci.c
Simple merge

diff --cc drivers/nvme/host/rdma.c
Simple merge

diff --cc include/linux/blk-mq.h
Simple merge