From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754659Ab0L3A6h (ORCPT ); Wed, 29 Dec 2010 19:58:37 -0500 Received: from terminus.zytor.com ([198.137.202.10]:55387 "EHLO mail.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754182Ab0L3A6g (ORCPT ); Wed, 29 Dec 2010 19:58:36 -0500 Message-ID: <4D1BD928.50701@zytor.com> Date: Wed, 29 Dec 2010 16:58:16 -0800 From: "H. Peter Anvin" User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.13) Gecko/20101209 Fedora/3.1.7-0.35.b3pre.fc14 Thunderbird/3.1.7 MIME-Version: 1.0 To: David Rientjes CC: Yinghai Lu , Thomas Gleixner , Ingo Molnar , linux-kernel@vger.kernel.org Subject: Re: [PATCH -v2 3/6] x86, 64bit, numa: Put pgtable to local node memory References: <4D0C072D.1040201@kernel.org> <4D19320B.7030007@kernel.org> <4D1933D1.9020609@kernel.org> <4D1BC856.4010202@kernel.org> <4D1BC94C.5040100@zytor.com> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 12/29/2010 04:39 PM, David Rientjes wrote: > 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? No, it's part of a much bigger patchset which doesn't have anything to do with NUMA. That's the problem. In other words, I need a sane way to merge them and resolve the conflict. -hpa