From: "H. Peter Anvin" <hpa@zytor.com>
To: David Rientjes <rientjes@google.com>
Cc: Yinghai Lu <yinghai@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH -v2 3/6] x86, 64bit, numa: Put pgtable to local node memory
Date: Wed, 29 Dec 2010 16:58:16 -0800 [thread overview]
Message-ID: <4D1BD928.50701@zytor.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1012291637270.6040@chino.kir.corp.google.com>
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
next prev parent reply other threads:[~2010-12-30 0:58 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-18 0:58 [PATCH 0/3] memblock related top down Yinghai Lu
2010-12-28 0:47 ` [PATCH 0/6] memblock related further cleanup for x86 Yinghai Lu
[not found] ` <4D19320B.7030007@kernel.org>
2010-12-28 0:47 ` [PATCH 1/6] x86: Change get_max_mapped() to inline Yinghai Lu
2010-12-29 23:05 ` H. Peter Anvin
2010-12-29 23:30 ` Yinghai Lu
2010-12-29 23:37 ` Yinghai Lu
2010-12-29 23:42 ` H. Peter Anvin
2010-12-29 23:45 ` [PATCH -v2 " Yinghai Lu
2011-02-16 8:50 ` [tip:x86/mm] " tip-bot for Yinghai Lu
2010-12-28 0:48 ` [PATCH 2/6] x86, 64bit, numa: Allocate memnodemap under max_pfn_mapped Yinghai Lu
2011-02-16 8:50 ` [tip:x86/mm] x86-64, " tip-bot for Yinghai Lu
2010-12-28 0:48 ` [PATCH 3/6] x86, 64bit, numa: Put pgtable to local node memory Yinghai Lu
2010-12-29 23:46 ` [PATCH -v2 " Yinghai Lu
2010-12-29 23:50 ` H. Peter Anvin
2010-12-30 0:11 ` Yinghai Lu
2010-12-30 0:39 ` David Rientjes
2010-12-30 0:58 ` H. Peter Anvin [this message]
2010-12-30 1:07 ` David Rientjes
2010-12-30 1:53 ` H. Peter Anvin
2010-12-30 9:06 ` Ingo Molnar
2010-12-30 10:28 ` [boot crash] " Ingo Molnar
2010-12-30 10:30 ` Ingo Molnar
2010-12-30 12:01 ` [build failure] " Ingo Molnar
2010-12-30 18:53 ` David Rientjes
2010-12-30 18:54 ` [patch] x86, numa: Fix CONFIG_DEBUG_PER_CPU_MAPS without NUMA emulation David Rientjes
2011-01-06 20:39 ` David Rientjes
2011-01-06 21:25 ` Yinghai Lu
2011-01-06 23:58 ` David Rientjes
2011-01-07 15:32 ` [tip:x86/numa] " tip-bot for David Rientjes
2010-12-30 21:18 ` [boot crash] Re: [PATCH -v2 3/6] x86, 64bit, numa: Put pgtable to local node memory Yinghai Lu
[not found] ` <AANLkTimpyRXS9dNFATh4GqtA46uynutAvK7Qb5S7WPFO@mail.gmail.com>
[not found] ` <20110105134434.GA22816@elte.hu>
2011-01-05 21:24 ` Yinghai Lu
2011-01-07 20:41 ` [PATCH] memblock: Don't adjust size in memblock_find_base() Yinghai Lu
2011-01-10 5:56 ` Benjamin Herrenschmidt
2011-01-10 6:59 ` Yinghai Lu
2011-01-12 1:35 ` Yinghai Lu
2011-01-29 0:37 ` [PATCH - resend] " Yinghai Lu
2011-02-03 20:25 ` Andrew Morton
2011-02-03 20:37 ` Yinghai Lu
2011-02-16 8:51 ` [tip:x86/mm] x86-64, numa: Put pgtable to local node memory tip-bot for Yinghai Lu
2010-12-28 0:48 ` [PATCH 4/6] x86: Use early pre-allocated page table buffer top-down Yinghai Lu
2010-12-28 0:48 ` [PATCH 5/6] x86, 64bit: Move out cleanup higmap [_brk_end, _end) out of init_memory_mapping() Yinghai Lu
2011-02-16 8:51 ` [tip:x86/mm] x86-64: " tip-bot for Yinghai Lu
2010-12-28 0:48 ` [PATCH 6/6] x86: Rename e820_table_* to pgt_buf_* Yinghai Lu
2010-12-30 21:54 ` [PATCH -v2 " Yinghai Lu
2010-12-28 20:21 ` [PATCH 0/3] memblock related top down H. Peter Anvin
2010-12-28 21:36 ` Yinghai Lu
2010-12-28 22:09 ` H. Peter Anvin
2010-12-28 22:25 ` Yinghai Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4D1BD928.50701@zytor.com \
--to=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=rientjes@google.com \
--cc=tglx@linutronix.de \
--cc=yinghai@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.