* linux-next: manual merge of the target-updates tree with the libata tree
@ 2015-08-04 3:35 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2015-08-04 3:35 UTC (permalink / raw)
To: Nicholas A. Bellinger, Tejun Heo; +Cc: linux-next, linux-kernel, Sagi Grimberg
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 sfr@canb•auug.org.au
^ permalink raw reply [flat|nested] 2+ messages in thread
* linux-next: manual merge of the target-updates tree with the libata tree
@ 2015-08-04 3:35 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2015-08-04 3:35 UTC (permalink / raw)
To: Nicholas A. Bellinger, Tejun Heo; +Cc: linux-next, linux-kernel, Sagi Grimberg
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 sfr@canb•auug.org.au
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-08-04 3:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-04 3:35 linux-next: manual merge of the target-updates tree with the libata tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2015-08-04 3:35 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox