From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Borislav Petkov <borislav.petkov@amd.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Doug Thompson <dougthompson@xmission.com>
Subject: linux-next: manual merge of the edac-amd tree with Linus' tree
Date: Wed, 5 Aug 2009 15:09:33 +1000 [thread overview]
Message-ID: <20090805150933.103de233.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 542 bytes --]
Hi Borislav,
Today's linux-next merge of the edac-amd tree got a conflict in
drivers/edac/amd64_edac.c between commit
126b67b8d26f6623d199aa59279f2e3243f2144c ("amd64_edac: fix ECC checking")
from Linus' tree and commit 793a2a12b43aba669c8b2604a45f000a394f142d
("amd64_edac: cleanup amd64_check_ecc_enabled") from the edac-amd tree.
I don't think the fix in the former patch is required, so I just used the
latter version.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2009-08-05 5:09 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-05 5:09 Stephen Rothwell [this message]
2009-08-05 6:22 ` linux-next: manual merge of the edac-amd tree with Linus' tree Borislav Petkov
2009-08-05 6:40 ` Rebasing the edac-amd tree (Was: Re: linux-next: manual merge of the edac-amd tree with Linus' tree) Stephen Rothwell
2009-08-05 7:42 ` Borislav Petkov
-- strict thread matches above, loose matches on Subject: below --
2015-06-26 7:08 linux-next: manual merge of the edac-amd tree with Linus' tree Stephen Rothwell
2015-06-26 7:27 ` Borislav Petkov
2015-06-26 8:22 ` Stephen Rothwell
2015-06-26 8:34 ` Borislav Petkov
2015-06-26 8:37 ` 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=20090805150933.103de233.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=borislav.petkov@amd.com \
--cc=dougthompson@xmission.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).