Hi Jens, Today's linux-next merge of the block tree got a conflict in drivers/scsi/scsi_error.c between commit a953809f9d1deb97bb27716d773cadd2feebccf8 ("[SCSI] Log msg when getting Unit Attention") from the scsi tree and commit f9ccdfe846639f7a4529ccab78468b2207382380 ("scsi: use REQ_TYPE_FS for flush request") from the block tree. Just context changes. I fixed it up (see below) and can carry the fax as necessary. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx diff --cc drivers/scsi/scsi_error.c index c60cffb,2768bf6..0000000 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c @@@ -307,33 -307,7 +307,20 @@@ static int scsi_check_sense(struct scsi (sshdr.asc == 0x04) && (sshdr.ascq == 0x02)) return FAILED; + if (sshdr.asc == 0x3f && sshdr.ascq == 0x0e) + scmd_printk(KERN_WARNING, scmd, + "Warning! Received an indication that the " + "LUN assignments on this target have " + "changed. The Linux SCSI layer does not " + "automatically remap LUN assignments.\n"); + else if (sshdr.asc == 0x3f) + scmd_printk(KERN_WARNING, scmd, + "Warning! Received an indication that the " + "operating parameters on this target have " + "changed. The Linux SCSI layer does not " + "automatically adjust these parameters.\n"); + - if (blk_barrier_rq(scmd->request)) - /* - * barrier requests should always retry on UA - * otherwise block will get a spurious error - */ - return NEEDS_RETRY; - else - /* - * for normal (non barrier) commands, pass the - * UA upwards for a determination in the - * completion functions - */ - return SUCCESS; - + return NEEDS_RETRY; /* these three are not supported */ case COPY_ABORTED: case VOLUME_OVERFLOW: -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html