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: Thu, 13 Aug 2015 14:55:35 +1000 From: Stephen Rothwell <sfr@...b.auug.org.au> To: Greg KH <greg@...ah.com>, Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>, Peter Zijlstra <peterz@...radead.org> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, "Jason A. Donenfeld" <Jason@...c4.com> Subject: linux-next: manual merge of the staging tree with the tip tree Hi Greg, Today's linux-next merge of the staging tree got a conflict in: drivers/staging/ozwpan/ozproto.c between commit: 5a447f09a8df ("staging: ozwpan: Fix hrtimer wreckage") from the tip tree and commit: a73e99cb67e7 ("staging: ozwpan: Remove from tree") from the staging tree. I fixed it up (I just removed the file) 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