Merge branch 'x86/urgent' into core/signal

Conflicts:
	arch/x86/kernel/signal_64.c

diff --cc arch/x86/kernel/ptrace.c
Simple merge

diff --cc arch/x86/kernel/traps_64.c
Simple merge

diff --cc include/asm-x86/ptrace.h
Simple merge