Merge branch 'linus' into x86/urgent, to be able to merge a dependent fix