Re: [PATCH -v2 3/6] x86, 64bit, numa: Put pgtable to local nodememory

[David Rientjes]

On Wed, 29 Dec 2010, Yinghai Lu wrote:

> >> -v2: update it to recent numa-emulation change
> >>
> >
> > Lovely, yet another interbranch conflict.  This makes me very concerned.
> >
> > What is the delta between these?
> >
> 
> your new x86/numa have
> 
>        setup_physnodes(addr, max_addr, acpi, amd);
>        fake_physnodes(acpi, amd, num_nodes);
> 
> instead of
> 
>         acpi_fake_nodes(nodes, num_nodes);
> 
> in  numa_emulation()
> 

That's from f51bf3073a1 (x86, numa: Fake apicid and pxm mappings for NUMA 
emulation) and c1c3443c9c (x86, numa: Fake node-to-cpumask for NUMA 
emulation) in x86/numa.  Given the subject line, I think your patchset is 
targeted to the same branch so I'm not sure what's concerning?