linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Borislav Petkov <borislav.petkov@amd.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Borislav Petkov <petkovbb@googlemail.com>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Rusty Russell <rusty@rustcorp.com.au>,
	Andreas Herrmann <andreas.herrmann3@amd.com>
Subject: Re: linux-next: manual merge of the edac-amd tree with the rr tree
Date: Thu, 30 Jul 2009 13:09:39 +0200	[thread overview]
Message-ID: <20090730110938.GA16659@aftab> (raw)
In-Reply-To: <20090730170850.6d777e96.sfr@canb.auug.org.au>

Hi Stephen,

On Thu, Jul 30, 2009 at 05:08:50PM +1000, Stephen Rothwell wrote:
> > thanks for fixing that. Yep, the topology patches in the edac tree are
> > not final yet, I've added them to the mix only because edac depends on
> > the node_id functionality. I'll fix them up later against the rr stuff.

I rediffed the topology bits against
cpumask:remove-topology_core_siblings-and-topology_thread_siblings-core.
patch from Rusty's tree so we should be good to go.

Also, I'm carrying couple of patches that should go through the x86 tree
and depending on when they go in, I'll drop them from mine. Just wanted
to give you heads up here in case you start getting merge conflicts :).

Thanks.

-- 
Regards/Gruss,
Boris.

Operating | Advanced Micro Devices GmbH
  System  | Karl-Hammerschmidt-Str. 34, 85609 Dornach b. München, Germany
 Research | Geschäftsführer: Thomas M. McCoy, Giuliano Meroni
  Center  | Sitz: Dornach, Gemeinde Aschheim, Landkreis München
  (OSRC)  | Registergericht München, HRB Nr. 43632

  reply	other threads:[~2009-07-30 11:10 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-07-30  5:41 linux-next: manual merge of the edac-amd tree with the rr tree Stephen Rothwell
2009-07-30  6:23 ` Borislav Petkov
2009-07-30  7:08   ` Stephen Rothwell
2009-07-30 11:09     ` Borislav Petkov [this message]
2009-07-31  2:01       ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2009-08-06  7:51 Stephen Rothwell
2009-08-06  8:07 ` Borislav Petkov
2009-11-19  5:23 Stephen Rothwell
2009-11-19  6:06 ` Borislav Petkov
2009-11-19  6:56   ` Rusty Russell

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=20090730110938.GA16659@aftab \
    --to=borislav.petkov@amd.com \
    --cc=andreas.herrmann3@amd.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=petkovbb@googlemail.com \
    --cc=rusty@rustcorp.com.au \
    --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;
as well as URLs for NNTP newsgroup(s).