2016-10-08 02:12:05

by Jens Axboe

[permalink] [raw]
Subject: [GIT PULL] blk-mq CPU hotplug

Hi Linus,

Last topical branch, this is the conversion of blk-mq to the new hotplug
state machine. This should merge cleanly.

Please pull!


git://git.kernel.dk/linux-block.git for-4.9/block-smp


----------------------------------------------------------------
Jens Axboe (1):
Merge branch 'smp/for-block' of git://git.kernel.org/.../tip/tip
into for-4.9/block-smp

Sebastian Andrzej Siewior (2):
blk-mq: Convert to new hotplug state machine
blk-mq: fixup "Convert to new hotplug state machine"

Thomas Gleixner (1):
blk-mq/cpu-notif: Convert to new hotplug state machine

arch/x86/kernel/smpboot.c | 11 --
block/Makefile | 2 +-
block/blk-mq-cpu.c | 67 ---------
block/blk-mq.c | 123 +++++++---------
block/blk-mq.h | 7 -
include/linux/blk-mq.h | 8 +-
include/linux/cpuhotplug.h | 112 +++++++++++++-
include/trace/events/cpuhp.h | 28 ++++
kernel/cpu.c | 344
+++++++++++++++++++++++++++++++------------
9 files changed, 444 insertions(+), 258 deletions(-)
delete mode 100644 block/blk-mq-cpu.c


--
Jens Axboe