Hi all,
Today's linux-next merge of the kmemcheck tree got a conflict in
arch/x86/mm/init_32.c between various commits from the x86 tree and
commits a7fff94fffaa0cecb923d6c1bb9b7691f608b49a ("Revert "kmemcheck: use
set_memory_4k() instead of disabling PSE"") and
760932c8607b736504a134ed6feec25e90e089ac ("kmemcheck: (finally) use 4k
pages for identity mapping") from the kmemcheck tree.
I fixed it up as in the tip/master branch (patching arch/x86/mm/init.c as
well).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpfbHd52wONv.pgp
Description: PGP signature
