tree 6c84e48d699397ab66e0e839a45db120a18d951b
parent 440e996095586967c39adb623e8428c435d59fa0
parent 76d697d10769048e5721510100bf3a9413a56385
author Linus Torvalds <torvalds@linux-foundation.org> 1422235414 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1422235414 -0800

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

Pull two block layer fixes from Jens Axboe:
 "Two small patches that should make it into 3.19:

   - a fixup from me for NVMe, making the cq_vector a signed variable.
     Otherwise our -1 comparison fails, and commit 2b25d981790b doesn't
     do what it was supposed to.

   - a fixup for the hotplug handling for blk-mq from Ming Lei, using
     the proper kobject referencing to ensure we release resources at
     the right time"

* 'for-linus' of git://git.kernel.dk/linux-block:
  blk-mq: fix hctx/ctx kobject use-after-free
  NVMe: cq_vector should be signed