Date: Thu, 30 Jul 2009 13:09:39 +0200
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
Message-ID: <20090730110938.GA16659@aftab>
References: <20090730154150.d4c326b5.sfr@canb.auug.org.au>
 <20090730062309.GA15057@liondog.tnic>
 <20090730170850.6d777e96.sfr@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset="iso-8859-1"
Content-Disposition: inline
In-Reply-To: <20090730170850.6d777e96.sfr@canb.auug.org.au>
User-Agent: Mutt/1.5.20 (2009-06-14)
Content-Transfer-Encoding: 8BIT
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1260
Lines: 32

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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/