Re: linux-next: manual merge of the edac-amd tree with the rr tree

[Stephen Rothwell]

Hi Boris,

On Thu, 30 Jul 2009 13:09:39 +0200 Borislav Petkov <borislav.petkov@xxxxxxx> 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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature