Merge branch 'mkp-fixes' into fixes

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/scsi/Kconfig
Simple merge

diff --cc drivers/scsi/advansys.c
Simple merge

diff --cc drivers/scsi/hosts.c
Simple merge

diff --cc drivers/scsi/hpsa.c
Simple merge

diff --cc drivers/scsi/mvsas/mv_init.c
Simple merge

diff --cc drivers/scsi/scsi_scan.c
Simple merge

diff --cc drivers/scsi/scsi_sysfs.c
Simple merge

diff --cc drivers/scsi/sd.c
Simple merge

diff --cc drivers/scsi/st.c
Simple merge

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

diff --cc include/scsi/scsi_host.h
Simple merge