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
..
include/arch	objtool: Rework header include paths	2021-01-13 18:13:14 -06:00
Build	objtool: Abstract alternative special case handling	2020-09-10 10:43:13 -05:00
decode.c	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
special.c	objtool: Fix retpoline detection in asm code	2021-01-26 11:11:59 -06:00