Ingo Molnar b1f480bc06 Merge branch 'x86/cpu' into WIP.x86/core, to merge the NOP changes & resolve a semantic conflict ... Conflict-merge this main commit in essence: a89dfde3dc: ("x86: Remove dynamic NOP selection") With this upstream commit: b908297047: ("bpf: Use NOP_ATOMIC5 instead of emit_nops(&prog, 5) for BPF_TRAMP_F_CALL_ORIG") Semantic merge conflict: arch/x86/net/bpf_jit_comp.c - memcpy(prog, ideal_nops[NOP_ATOMIC5], X86_PATCH_SIZE); + memcpy(prog, x86_nops[5], X86_PATCH_SIZE); Signed-off-by: Ingo Molnar <mingo@kernel.org>		2021-04-02 12:36:30 +02:00
..
arch/x86	Merge branch 'x86/cpu' into WIP.x86/core, to merge the NOP changes & resolve a semantic conflict	2021-04-02 12:36:30 +02:00
Documentation	objtool: Support stack layout changes in alternatives	2021-01-14 09:53:54 -06:00
include/objtool	clang-lto for v5.12-rc1 (part2)	2021-02-23 15:13:45 -08:00
.gitignore	objtool: Rework header include paths	2021-01-13 18:13:14 -06:00
Build	objtool: Enable compilation of objtool for all architectures	2020-05-20 09:17:28 -05:00
builtin-check.c	clang-lto for v5.12-rc1 (part2)	2021-02-23 15:13:45 -08:00
builtin-orc.c	objtool: Refactor ORC section generation	2021-01-14 09:53:42 -06:00
check.c	objtool,x86: Fix uaccess PUSHF/POPF validation	2021-03-12 09:15:49 +01:00
elf.c	objtool updates:	2021-02-23 09:56:13 -08:00
Makefile	objtool: Refactor ORC section generation	2021-01-14 09:53:42 -06:00
objtool.c	clang-lto for v5.12-rc1 (part2)	2021-02-23 15:13:45 -08:00
orc_dump.c	x86/unwind/orc: Change REG_SP_INDIRECT	2021-02-10 20:53:51 +01:00
orc_gen.c	objtool: Support stack layout changes in alternatives	2021-01-14 09:53:54 -06:00
special.c	objtool: Rework header include paths	2021-01-13 18:13:14 -06:00
sync-check.sh	Merge branch 'x86/cpu' into WIP.x86/core, to merge the NOP changes & resolve a semantic conflict	2021-04-02 12:36:30 +02:00
weak.c	objtool: Refactor ORC section generation	2021-01-14 09:53:42 -06:00