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: Sun, 17 Feb 2013 22:31:38 -0800 From: "H. Peter Anvin" <hpa@...or.com> To: Stephen Rothwell <sfr@...b.auug.org.au>, Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>, Peter Zijlstra <peterz@...radead.org> CC: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Michal Marek <mmarek@...e.cz> Subject: Re: linux-next: manual merge of the tip tree with the kbuild tree That is the right fix indeed. Stephen Rothwell <sfr@...b.auug.org.au> wrote: >Hi all, > >Today's linux-next merge of the tip tree got a conflict in >kernel/timeconst.pl between commit 70730bca1331 ("kernel: Replace >timeconst.pl with a bc script") from the kbuild tree and commit >63a3f603413f ("timeconst.pl: Eliminate Perl warning") from the tip >tree. > >I just droppped the tip tree version (I deleted the file) and can carry >the fix as necessary (no action is required). -- Sent from my mobile phone. Please excuse brevity and lack of formatting. -- 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