Skip to content
  • Linus Torvalds's avatar
    Merge branch 'for-4.5/drivers' of git://git.kernel.dk/linux-block · 64120354
    Linus Torvalds authored
    Pull block driver updates from Jens Axboe:
     "This is the block driver pull request for 4.5, with the exception of
      NVMe, which is in a separate branch and will be posted after this one.
    
      This pull request contains:
    
       - A set of bcache stability fixes, which have been acked by Kent.
         These have been used and tested for more than a year by the
         community, so it's about time that they got in.
    
       - A set of drbd updates from the drbd team (Andreas, Lars, Philipp)
         and Markus Elfring, Oleg Drokin.
    
       - A set of fixes for xen blkback/front from the usual suspects, (Bob,
         Konrad) as well as community based fixes from Kiri, Julien, and
         Peng.
    
       - A 2038 time fix for sx8 from Shraddha, with a fix from me.
    
       - A small mtip32xx cleanup from Zhu Yanjun.
    
       - A null_blk division fix from Arnd"
    
    * 'for-4.5/drivers' of git://git.kernel.dk/linux-block: (71 commits)
      null_blk: use sector_div instead of do_div
      mtip32xx: restrict variables visible in current code module
      xen/blkfront: Fix crash if backend doesn't follow the right states.
      xen/blkback: Fix two memory leaks.
      xen/blkback: make st_ statistics per ring
      xen/blkfront: Handle non-indirect grant with 64KB pages
      xen-blkfront: Introduce blkif_ring_get_request
      xen-blkback: clear PF_NOFREEZE for xen_blkif_schedule()
      xen/blkback: Free resources if connect_ring failed.
      xen/blocks: Return -EXX instead of -1
      xen/blkback: make pool of persistent grants and free pages per-queue
      xen/blkback: get the number of hardware queues/rings from blkfront
      xen/blkback: pseudo support for multi hardware queues/rings
      xen/blkback: separate ring information out of struct xen_blkif
      xen/blkfront: correct setting for xen_blkif_max_ring_order
      xen/blkfront: make persistent grants pool per-queue
      xen/blkfront: Remove duplicate setting of ->xbdev.
      xen/blkfront: Cleanup of comments, fix unaligned variables, and syntax errors.
      xen/blkfront: negotiate number of queues/rings to be used with backend
      xen/blkfront: split per device io_lock
      ...
    64120354