Merge branch 'x86/pat' into x86/urgent