Merge branch 'linus' into x86/urgent, to refresh the tree