From: Peter Maydell <peter.maydell@linaro.org>
To: Igor Mammedov <imammedo@redhat.com>
Cc: Eduardo Habkost <ehabkost@redhat.com>,
QEMU Developers <qemu-devel@nongnu.org>,
Laurent Vivier <lvivier@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>
Subject: Re: [Qemu-devel] [PATCH for-2.10] numa: Move numa_legacy_auto_assign_ram to pc-i440fx-2.9
Date: Wed, 23 Aug 2017 16:13:11 +0100 [thread overview]
Message-ID: <CAFEAcA8WoyX6NcLxJPqLb1h70sSAguXykriEXR04-pJNDUYXMA@mail.gmail.com> (raw)
In-Reply-To: <20170823144734.0a5f920c@nial.brq.redhat.com>
On 23 August 2017 at 13:47, Igor Mammedov <imammedo@redhat.com> wrote:
> On Fri, 18 Aug 2017 16:09:43 -0300
> Eduardo Habkost <ehabkost@redhat.com> wrote:
>
>> The 'm->numa_auto_assign_ram = numa_legacy_auto_assign_ram;' line
>> was supposed to be in pc_i440fx_2_9_machine_options() (see commit
>> 3bfe5716 "numa: equally distribute memory on nodes"), but the
>> merge commit adb354dd ("Merge remote-tracking branch
>> 'mst/tags/for_upstream' into staging") moved it to the
>> pc_i440fx_2_10_machine_options().
>>
>> Move the line back to pc_i440fx_2_9_machine_options().
>>
>> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> Reviewed-by: Igor Mammedov <imammedo@redhat.com>
>
>
> Peter,
>
> Could you merge this mis-merge fix as well for rc4?
Sure, applied to master.
thanks
-- PMM
prev parent reply other threads:[~2017-08-23 15:13 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-18 19:09 [Qemu-devel] [PATCH for-2.10] numa: Move numa_legacy_auto_assign_ram to pc-i440fx-2.9 Eduardo Habkost
2017-08-18 19:15 ` Eduardo Habkost
2017-08-21 11:17 ` Igor Mammedov
2017-08-21 12:00 ` Peter Maydell
2017-08-23 12:47 ` Igor Mammedov
2017-08-23 15:13 ` Peter Maydell [this message]
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=CAFEAcA8WoyX6NcLxJPqLb1h70sSAguXykriEXR04-pJNDUYXMA@mail.gmail.com \
--to=peter.maydell@linaro.org \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=lvivier@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).