From: Mauro Carvalho Chehab <mchehab@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
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 07:50:36 -0400 (EDT) [thread overview]
Message-ID: <1209036982.100421255434636304.JavaMail.root@zmail05.collab.prod.int.phx2.redhat.com> (raw)
In-Reply-To: <20091012142328.710881fe.sfr@canb.auug.org.au>
----- "Stephen Rothwell" <sfr@canb.auug.org.au> 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.
next prev parent reply other threads:[~2009-10-13 11:51 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 [this message]
2009-10-13 11:53 ` Stephen Rothwell
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=1209036982.100421255434636304.JavaMail.root@zmail05.collab.prod.int.phx2.redhat.com \
--to=mchehab@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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