Merge branch 'x86/ptrace' into x86/tsc