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: Mon, 12 Oct 2009 07:05:34 +0200 From: Borislav Petkov <petkovbb@...glemail.com> To: Stephen Rothwell <sfr@...b.auug.org.au>, Ingo Molnar <mingo@...e.hu> Cc: Mauro Carvalho Chehab <mchehab@...hat.com>, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org Subject: Re: linux-next: manual merge of the i7core_edac tree with Linus' tree On Mon, Oct 12, 2009 at 02:23:28PM +1100, Stephen Rothwell wrote: > Today's linux-next merge of the i7core_edac tree got a conflict in > arch/x86/kernel/cpu/mcheck/mce.c between commit > f436f8bb73138bc74eb1c6527723e00988ad8a8a ("x86: EDAC: MCE: Fix MCE > decoding callback logic") from Linus' tree and commit > 699a7dbe1ffdf4b25c1475e45590b181c3e23087 ("edac_mce: Add an interface > driver to report mce errors via edac") from the i7core_edac tree. The current way Ingo suggested is using an atomic notifier instead from within print_mce to convey MCE info to an EDAC driver, see http://marc.info/?l=linux-kernel&m=125455310112745&w=2 Ingo, what are your plans with that? I'm guessing the .33 timeframe? Thanks. -- Regards/Gruss, Boris. -- 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