Merge branch 'x86/mm' into x86/asm, to merge branches
authorIngo Molnar <mingo@kernel.org>
Fri, 10 Nov 2017 07:05:30 +0000 (08:05 +0100)
committerIngo Molnar <mingo@kernel.org>
Fri, 10 Nov 2017 07:05:30 +0000 (08:05 +0100)
commitd04fdafc066fed10cc9610b2f36f1d0ff0327864
treef3365e4bf1064737a36e5488641a14e54fc173bc
parent7980f029d05d8a3b4634aa6952e1ec51bce9431f
parentc5e260890d5fd6687287f2b532c738a359a61a82
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>
arch/x86/mm/mem_encrypt.c
mm/sparse.c