Hi all, this series cleans up the scsi ioctl handler and merges the "block layer" SCSI ioctl code that is only used by the SCSI layer and its drivers now into the main SCSI ioctl handler. Diffstat: b/block/Kconfig | 26 - b/block/Makefile | 3 b/block/bsg.c | 123 +---- b/drivers/block/Kconfig | 3 b/drivers/block/paride/Kconfig | 1 b/drivers/cdrom/cdrom.c | 7 b/drivers/scsi/Kconfig | 18 b/drivers/scsi/Makefile | 3 b/drivers/scsi/ch.c | 73 --- b/drivers/scsi/scsi_bsg.c | 95 ++++ b/drivers/scsi/scsi_common.c | 6 b/drivers/scsi/scsi_ioctl.c | 848 ++++++++++++++++++++++++++++++++++----- b/drivers/scsi/scsi_lib.c | 7 b/drivers/scsi/scsi_priv.h | 10 b/drivers/scsi/sd.c | 66 --- b/drivers/scsi/sg.c | 33 - b/drivers/scsi/sr.c | 74 --- b/drivers/scsi/st.c | 72 +-- b/drivers/target/Kconfig | 2 b/fs/nfsd/Kconfig | 2 b/include/linux/blkdev.h | 21 b/include/linux/bsg.h | 11 b/include/scsi/scsi_ioctl.h | 9 b/include/scsi/scsi_request.h | 2 block/scsi_ioctl.c | 890 ----------------------------------------- 25 files changed, 1011 insertions(+), 1394 deletions(-)