From: Rusty Russell <rusty@rustcorp.com.au>
To: Borislav Petkov <petkovbb@googlemail.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Borislav Petkov <borislav.petkov@amd.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the edac-amd tree with the rr tree
Date: Thu, 19 Nov 2009 17:26:44 +1030 [thread overview]
Message-ID: <200911191726.44667.rusty@rustcorp.com.au> (raw)
In-Reply-To: <20091119060648.GA15404@liondog.tnic>
On Thu, 19 Nov 2009 04:36:48 pm Borislav Petkov wrote:
> Hi Stephen,
>
> On Thu, Nov 19, 2009 at 04:23:54PM +1100, Stephen Rothwell wrote:
> > 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).
>
> yes, we agreed I should pick up this patch. Rusty?
Thanks!
Rusty.
next prev parent reply other threads:[~2009-11-19 6:56 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-19 5:23 linux-next: manual merge of the edac-amd tree with the rr tree Stephen Rothwell
2009-11-19 6:06 ` Borislav Petkov
2009-11-19 6:56 ` Rusty Russell [this message]
-- 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=200911191726.44667.rusty@rustcorp.com.au \
--to=rusty@rustcorp.com.au \
--cc=borislav.petkov@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=petkovbb@googlemail.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.