Merge branch 'x86/core' into perf/core, to resolve conflicts and to pick up completed topic tree

Browse source

Conflicts:
	tools/perf/check-headers.sh

Signed-off-by: Ingo Molnar <mingo@kernel.org>

...

This commit is contained in:

Ingo Molnar 2019-11-25 09:09:27 +01:00

parent c494cd6469 004e8dce9c

commit ceb9e77324

12 changed files with 128 additions and 13 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

14

tools/arch/x86/include/asm/emulate_prefix.h

View file

6

tools/arch/x86/include/asm/insn.h

View file

34

tools/arch/x86/lib/insn.c

View file

3

tools/objtool/sync-check.sh

View file

3

tools/perf/check-headers.sh

View file