Merge branch 'x86/mm' into x86/asm, to merge branches

Most of x86/mm is already in x86/asm, so merge the rest too.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc arch/x86/mm/mem_encrypt.c
Simple merge

diff --cc mm/sparse.c
Simple merge