diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-09 17:32:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-09 17:32:20 -0700 |
| commit | 24532f768121b07b16178ffb40442ece43365cbd (patch) | |
| tree | ca2eaf2c3ed031dd3aa977af95df77bfa2e18cc6 /block/Makefile | |
| parent | 12e3d3cdd975fe986cc5c35f60b1467a8ec20b80 (diff) | |
| parent | 97a32864e6de5944c6356049f60569de01e9ba1f (diff) | |
| download | linux-24532f768121b07b16178ffb40442ece43365cbd.tar.gz linux-24532f768121b07b16178ffb40442ece43365cbd.tar.bz2 linux-24532f768121b07b16178ffb40442ece43365cbd.zip | |
Merge branch 'for-4.9/block-smp' of git://git.kernel.dk/linux-block
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
Diffstat (limited to 'block/Makefile')
| -rw-r--r-- | block/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/Makefile b/block/Makefile index 37a0d93f97bb..36acdd7545be 100644 --- a/block/Makefile +++ b/block/Makefile @@ -6,7 +6,7 @@ obj-$(CONFIG_BLOCK) := bio.o elevator.o blk-core.o blk-tag.o blk-sysfs.o \ blk-flush.o blk-settings.o blk-ioc.o blk-map.o \ blk-exec.o blk-merge.o blk-softirq.o blk-timeout.o \ blk-lib.o blk-mq.o blk-mq-tag.o \ - blk-mq-sysfs.o blk-mq-cpu.o blk-mq-cpumap.o ioctl.o \ + blk-mq-sysfs.o blk-mq-cpumap.o ioctl.o \ genhd.o scsi_ioctl.o partition-generic.o ioprio.o \ badblocks.o partitions/ |