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:46 +1000

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