Hi all,
Today's linux-next merge of the kmemcheck tree got a conflict in
arch/x86/mm/init_64.c between commit
f765090a2617b8d9cb73b71e0aa850c29460d8be ("x86: move init_memory_mapping
() to common mm/init.c") from the x86 tree and
commit760932c8607b736504a134ed6feec25e90e089ac ("kmemcheck: (finally)
use 4k pages for identity mapping") from the kmemcheck tree.
I fixed it up as in the tip/master branch.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpprvNmOxkMZ.pgp
Description: PGP signature
