lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 4 Aug 2015 13:35:27 +1000 From: Stephen Rothwell <sfr@...b.auug.org.au> To: "Nicholas A. Bellinger" <nab@...ux-iscsi.org>, Tejun Heo <tj@...nel.org> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Sagi Grimberg <sagig@...lanox.com> Subject: linux-next: manual merge of the target-updates tree with the libata tree 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@...b.auug.org.au -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists