Merge remote-tracking branch 'block/for-next'

Conflicts:
	init/Kconfig

diff --cc MAINTAINERS
Simple merge

diff --cc block/blk-core.c
Simple merge

diff --cc block/genhd.c
Simple merge

diff --cc block/ioctl.c
Simple merge

diff --cc drivers/block/Kconfig
Simple merge

diff --cc drivers/block/floppy.c
Simple merge

diff --cc drivers/md/dm.c
Simple merge

diff --cc drivers/md/md.c
Simple merge

diff --cc drivers/target/target_core_iblock.c
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc lib/scatterlist.c
Simple merge