The patch titled cciss: include scsi/scsi.h unconditionally has been removed from the -mm tree. Its filename was cciss-include-scsi-scsih-unconditionally.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: cciss: include scsi/scsi.h unconditionally From: Stephen Cameron <steve.cameron@xxxxxx> Make cciss unconditionally include scsi/scsi.h, because of the use of SCSI_IOCTL_GET_IDLUN and SCSI_IOCTL_GET_BUS_NUMBER. Signed-off-by: Stephen M. Cameron <steve.cameron@xxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/block/cciss.c | 1 + drivers/block/cciss_scsi.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/block/cciss.c~cciss-include-scsi-scsih-unconditionally drivers/block/cciss.c --- a/drivers/block/cciss.c~cciss-include-scsi-scsih-unconditionally +++ a/drivers/block/cciss.c @@ -45,6 +45,7 @@ #include <linux/blkdev.h> #include <linux/genhd.h> #include <linux/completion.h> +#include <scsi/scsi.h> #include <scsi/sg.h> #include <scsi/scsi_ioctl.h> #include <linux/cdrom.h> diff -puN drivers/block/cciss_scsi.c~cciss-include-scsi-scsih-unconditionally drivers/block/cciss_scsi.c --- a/drivers/block/cciss_scsi.c~cciss-include-scsi-scsih-unconditionally +++ a/drivers/block/cciss_scsi.c @@ -35,7 +35,6 @@ #include <asm/atomic.h> -#include <scsi/scsi.h> #include <scsi/scsi_cmnd.h> #include <scsi/scsi_device.h> #include <scsi/scsi_host.h> _ Patches currently in -mm which might be from steve.cameron@xxxxxx are origin.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html