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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 4 Aug 2015 13:35:27 +1000

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-masked]