Messages in this thread | | | Date | Tue, 13 Oct 2009 22:53:04 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the i7core_edac tree with Linus' tree |
| |
Hi Mauro,
On Tue, 13 Oct 2009 07:50:36 -0400 (EDT) Mauro Carvalho Chehab <mchehab@redhat.com> 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 sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |