[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Date: Fri, 31 Jul 2009 12:01:46 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Borislav Petkov <borislav.petkov@....com>
Cc: Borislav Petkov <petkovbb@...glemail.com>,
linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Rusty Russell <rusty@...tcorp.com.au>,
Andreas Herrmann <andreas.herrmann3@....com>
Subject: Re: linux-next: manual merge of the edac-amd tree with the rr tree
Hi Boris,
On Thu, 30 Jul 2009 13:09:39 +0200 Borislav Petkov <borislav.petkov@....com> wrote:
>
> 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.
Thanks.
> 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 :).
OK
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists