Merge remote branch 'linus/master' into x86/bootmem