Hi Nicholas,
Today's linux-next merge of the target-updates tree got a conflict in:
drivers/ata/libata-scsi.c
between commit:
fe16d4f202c5 ("Revert "libata-eh: Set 'information' field for autosense"")
from the libata tree and commit:
f5a8b3a796db ("scsi: Protect against buffer possible overflow in
scsi_set_sense_information")
from the target-updates tree.
I fixed it up (the former removed some code that was updated by the
latter, so I just removed the code) 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/
