From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mauro Carvalho Chehab <mchehab@redhat•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Ingo Molnar <mingo@elte•hu>
Subject: Re: linux-next: manual merge of the i7core_edac tree with Linus' tree
Date: Tue, 13 Oct 2009 22:53:04 +1100 [thread overview]
Message-ID: <20091013225304.211dc64e.sfr@canb.auug.org.au> (raw)
In-Reply-To: <1209036982.100421255434636304.JavaMail.root@zmail05.collab.prod.int.phx2.redhat.com>
[-- Attachment #1: Type: text/plain, Size: 533 bytes --]
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/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
prev parent reply other threads:[~2009-10-13 11:53 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-12 3:23 linux-next: manual merge of the i7core_edac tree with Linus' tree Stephen Rothwell
2009-10-12 5:05 ` Borislav Petkov
2009-10-12 10:24 ` Ingo Molnar
2009-10-13 11:50 ` Mauro Carvalho Chehab
2009-10-13 11:53 ` Stephen Rothwell [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091013225304.211dc64e.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab@redhat$(echo .)com \
--cc=mingo@elte$(echo .)hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox