>
> * Zhang Rui <rui.zhang@intel.com> wrote:
>
> >
> > x86_32: Mark ACPI NVS memory region.
> >
> > Signed-off-by: Zhang Rui <rui.zhang@intel.com>
> > ---
> > arch/x86/kernel/e820_32.c | 26 ++++++++++++++++++++++++++
>
> please do this change against tip/master or linux-next, as this file
> has
> been heavily modified and unified already. See:
>
>
http://people.redhat.com/mingo/tip.git/README
>
>