Merge branch 'x86/mm' into x86/core