On 23 August 2017 at 13:47, Igor Mammedov <[email protected]> wrote: > On Fri, 18 Aug 2017 16:09:43 -0300 > Eduardo Habkost <[email protected]> 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 <[email protected]> > Reviewed-by: Igor Mammedov <[email protected]> > > > Peter, > > Could you merge this mis-merge fix as well for rc4?
Sure, applied to master. thanks -- PMM
