Merge branch 'x86/mm' into efi/core, to pick up dependencies