Merge branch 'x86/core' into perf/core, to resolve conflicts and to pick up completed topic tree
Conflicts:
tools/perf/check-headers.sh
Signed-off-by: 
Ingo Molnar <mingo@kernel.org>
Showing
- arch/x86/include/asm/asm.h 5 additions, 3 deletionsarch/x86/include/asm/asm.h
- arch/x86/include/asm/emulate_prefix.h 14 additions, 0 deletionsarch/x86/include/asm/emulate_prefix.h
- arch/x86/include/asm/insn.h 6 additions, 0 deletionsarch/x86/include/asm/insn.h
- arch/x86/include/asm/xen/interface.h 4 additions, 7 deletionsarch/x86/include/asm/xen/interface.h
- arch/x86/kernel/kprobes/core.c 4 additions, 0 deletionsarch/x86/kernel/kprobes/core.c
- arch/x86/kvm/x86.c 3 additions, 1 deletionarch/x86/kvm/x86.c
- arch/x86/lib/insn.c 34 additions, 0 deletionsarch/x86/lib/insn.c
- tools/arch/x86/include/asm/emulate_prefix.h 14 additions, 0 deletionstools/arch/x86/include/asm/emulate_prefix.h
- tools/arch/x86/include/asm/insn.h 6 additions, 0 deletionstools/arch/x86/include/asm/insn.h
- tools/arch/x86/lib/insn.c 34 additions, 0 deletionstools/arch/x86/lib/insn.c
- tools/objtool/sync-check.sh 2 additions, 1 deletiontools/objtool/sync-check.sh
- tools/perf/check-headers.sh 2 additions, 1 deletiontools/perf/check-headers.sh
Please register or sign in to comment