linux-next: manual merge of the target-updates tree with the libata tree

2015-08-03 Thread Stephen Rothwell
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

linux-next: manual merge of the target-updates tree with the libata tree

2015-08-03 Thread Stephen Rothwell
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

linux-next: manual merge of the target-updates tree with the libata tree

2015-08-03 Thread Stephen Rothwell
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

linux-next: manual merge of the target-updates tree with the libata tree

2015-08-03 Thread Stephen Rothwell
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