Skip to content
  • Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.dk/linux-block · e0d07225
    Linus Torvalds authored
    Pull block layer fixes from Jens Axboe:
     "A collection of fixes for this merge window, either fixes for existing
      issues, or parts that were waiting for acks to come in. This pull
      request contains:
    
       - Allocation of nvme queues on the right node from Shaohua.
    
         This was ready long before the merge window, but waiting on an ack
         from Bjorn on the PCI bit. Now that we have that, the three patches
         can go in.
    
       - Two fixes for blk-mq-sched with nvmeof, which uses hctx specific
         request allocations. This caused an oops. One part from Sagi, one
         part from Omar.
    
       - A loop partition scan deadlock fix from Omar, fixing a regression
         in this merge window.
    
       - A three-patch series from Keith, closing up a hole on clearing out
         requests on shutdown/resume.
    
       - A stable fix for nbd from Josef, fixing a leak of sockets.
    
       - Two fixes for a regression in this window from Jan, fixing a
         problem with one of his earlier patches dealing with queue vs bdi
         life times.
    
       - A fix for a regression with virtio-blk, causing an IO stall if
         scheduling is used. From me.
    
       - A fix for an io context lock ordering problem. From me"
    
    * 'for-linus' of git://git.kernel.dk/linux-block:
      block: Move bdi_unregister() to del_gendisk()
      blk-mq: ensure that bd->last is always set correctly
      block: don't call ioc_exit_icq() with the queue lock held for blk-mq
      block: Initialize bd_bdi on inode initialization
      loop: fix LO_FLAGS_PARTSCAN hang
      nvme: Complete all stuck requests
      blk-mq: Provide freeze queue timeout
      blk-mq: Export blk_mq_freeze_queue_wait
      nbd: stop leaking sockets
      blk-mq: move update of tags->rqs to __blk_mq_alloc_request()
      blk-mq: kill blk_mq_set_alloc_data()
      blk-mq: make blk_mq_alloc_request_hctx() allocate a scheduler request
      blk-mq-sched: Allocate sched reserved tags as specified in the original queue tagset
      nvme: allocate nvme_queue in correct node
      PCI: add an API to get node from vector
      blk-mq: allocate blk_mq_tags and requests in correct node
    e0d07225