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,
Rusty Russell <rusty@rustcorp•com.au>
Subject: linux-next: manual merge of the edac-amd tree with the rr tree
Date: Thu, 19 Nov 2009 16:23:54 +1100 [thread overview]
Message-ID: <20091119162354.8800a885.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 649 bytes --]
Hi Borislav,
Today's linux-next merge of the edac-amd tree got a conflict in
drivers/edac/amd64_edac.c because commit
4de1ce0c99ff838090d3b57cab8bc6eeb303dda5
("cpumask:amd64_edac-cpumask_t-remove") from the rr tree and commit
2fd9af91b92c10e58993f9eb70300fdff32698fb ("cpumask: use modern cpumask
style in drivers/edac/amd64_edac.c") from the edac-amd tree are the same
patch but there are further changes in the edac-amd tree. So, Rusty, I
guess you can drop that patch (unless something later in the rr tree
depends on it).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next reply other threads:[~2009-11-19 5:23 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-19 5:23 Stephen Rothwell [this message]
2009-11-19 6:06 ` linux-next: manual merge of the edac-amd tree with the rr tree Borislav Petkov
2009-11-19 6:56 ` Rusty Russell
-- strict thread matches above, loose matches on Subject: below --
2009-08-06 7:51 Stephen Rothwell
2009-08-06 8:07 ` Borislav Petkov
2009-07-30 5:41 Stephen Rothwell
2009-07-30 6:23 ` Borislav Petkov
2009-07-30 7:08 ` Stephen Rothwell
2009-07-30 11:09 ` Borislav Petkov
2009-07-31 2:01 ` 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=20091119162354.8800a885.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=borislav.petkov@amd$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rusty@rustcorp$(echo .)com.au \
/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