Conflicts:
	tools/objtool/arch/x86/decode.c
Signed-off-by: NIngo Molnar <mingo@kernel.org>