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: Fri, 13 Nov 2015 12:06:05 +1100 From: Stephen Rothwell <sfr@...b.auug.org.au> To: "Nicholas A. Bellinger" <nab@...ux-iscsi.org>, James Bottomley <James.Bottomley@...senPartnership.com> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org Subject: linux-next: manual merge of the target-merge tree with the scsi tree Hi Nicholas, Today's linux-next merge of the target-merge tree got conflicts in several files. It looks like a newer version of all the commits in the target-merge tree has been applied to the scsi tree, so I just dropped the target-merge tree for today. You might like to tidy it up with respect to the current scsi tree. -- 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