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, 23 Jul 2013 16:56:09 -0700 From: Olof Johansson <olof@...om.net> To: Stephen Boyd <sboyd@...eaurora.org> Cc: "arm@...nel.org" <arm@...nel.org>, Arnd Bergmann <arnd@...db.de>, Thomas Gleixner <tglx@...utronix.de>, Russell King <rmk@....linux.org.uk>, David Brown <davidb@...eaurora.org>, Barry Song <baohua.song@....com>, "linux-arm-kernel@...ts.infradead.org" <linux-arm-kernel@...ts.infradead.org>, "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org> Subject: Re: [GIT PULL] Remove ARM local timer API On Tue, Jul 23, 2013 at 4:40 PM, Stephen Boyd <sboyd@...eaurora.org> wrote: > On 07/23, Olof Johansson wrote: >> Merged in as localtimer/removal into next/cleanup. >> >> I had quite a few merge conflicts due to the __cpuinit removal, so >> please double-check my resolutions. >> > > A __cpuinit is leftover in smp_twd.c. Hopefully you can just > redo the merge? Done, thanks for catching it. I thought I grepped for them but I somehow missed that one. Fixed now. -Olof -- 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