Merge branch 'for-4.9/block-smp' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Oct 2016 00:32:20 +0000 (17:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Oct 2016 00:32:20 +0000 (17:32 -0700)
Pull blk-mq CPU hotplug update from Jens Axboe:
 "This is the conversion of blk-mq to the new hotplug state machine"

* 'for-4.9/block-smp' of git://git.kernel.dk/linux-block:
  blk-mq: fixup "Convert to new hotplug state machine"
  blk-mq: Convert to new hotplug state machine
  blk-mq/cpu-notif: Convert to new hotplug state machine

1  2 
block/Makefile
block/blk-mq.c
block/blk-mq.h
include/linux/blk-mq.h

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