Hi Mauro,
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.
I don't know how to resolve these two commits so I have dropped the
i7core_edac tree for today.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
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.
* Borislav Petkov <[email protected]> wrote:
> 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?
yeah, that looks like .33 material. (unless it fixes a regression)
I have queued it up in tip:x86/mce.
Thanks,
Ingo
----- "Stephen Rothwell" <[email protected]> escreveu:
> Hi Mauro,
>
> 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.
>
> I don't know how to resolve these two commits so I have dropped the
> i7core_edac tree for today.
Thanks for letting me know. I've rebased it fixing the merge conflict. For now,
I just removed the call to edac_mce_parse() for Uncorrected Errors, since I'll
eventually replace that part of the code with something better.
You should now be able to merge it without merging conflicts.
Cheers,
Mauro.
Hi Mauro,
On Tue, 13 Oct 2009 07:50:36 -0400 (EDT) Mauro Carvalho Chehab <[email protected]> wrote:
>
> Thanks for letting me know. I've rebased it fixing the merge conflict. For now,
> I just removed the call to edac_mce_parse() for Uncorrected Errors, since I'll
> eventually replace that part of the code with something better.
>
> You should now be able to merge it without merging conflicts.
OK, thanks.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/