Merge remote-tracking branch 'linus/master' into x86/urgent