fully merge up to scsi-misc-2.6