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

[H. Peter Anvin]

On 12/29/2010 03:46 PM, 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?

	-hpa

-- 
H. Peter Anvin, Intel Open Source Technology Center
I work for Intel.  I don't speak on their behalf.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/