Hi Nicholas,
Today's linux-next merge of the target-updates tree got conflicts in:
drivers/scsi/scsi_error.c
include/scsi/scsi_eh.h
between commit:
fe16d4f202c5 ("Revert "libata-eh: Set 'information' field for autosense"")
from the libata tree and commit:
7708c1656552 ("scsi: Move sense handling routines to scsi_common")
from the target-updates tree.
I fixed it up (I left scsi_set_sense_information in its new place) and
can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell [email protected]
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
