From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 30 Dec 2015 18:26:20 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-block
X-Git-Tag: Ubuntu-5.2.0-15.16~10080
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=c6169202e40868fd00de7ce35ee16c81b1f9e123;p=mirror_ubuntu-eoan-kernel.git

Merge branch 'for-linus' of git://git.kernel.dk/linux-block

Pull block fixes from Jens Axboe:
 "Make the block layer great again.

  Basically three amazing fixes in this pull request, split into 4
  patches.  Believe me, they should go into 4.4.  Two of them fix a
  regression, the third and last fixes an easy-to-trigger bug.

   - Fix a bad irq enable through null_blk, for queue_mode=1 and using
     timer completions.  Add a block helper to restart a queue
     asynchronously, and use that from null_blk.  From me.

   - Fix a performance issue in NVMe.  Some devices (Intel Pxxxx) expose
     a stripe boundary, and performance suffers if we cross it.  We took
     that into account for merging, but not for the newer splitting
     code.  Fix from Keith.

   - Fix a kernel oops in lightnvm with multiple channels.  From Matias"

* 'for-linus' of git://git.kernel.dk/linux-block:
  lightnvm: wrong offset in bad blk lun calculation
  null_blk: use async queue restart helper
  block: add blk_start_queue_async()
  block: Split bios on chunk boundaries
---

c6169202e40868fd00de7ce35ee16c81b1f9e123