Merge branch 'linus' into x86/memtest