www.infradead.org Git - users/jedix/linux-maple.git/commit

author	Ingo Molnar <mingo@kernel.org>
	Fri, 2 Apr 2021 10:34:19 +0000 (12:34 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Fri, 2 Apr 2021 10:36:30 +0000 (12:36 +0200)
commit	b1f480bc0686e65d5413c035bd13af2ea4888784
tree	55e7ac89ca9e96aed8c7568d032367d88b132b96	tree
parent	e855e80d001530ec0bbb1ee1ca6a16ac6bdf9acf	commit \| diff
parent	a331f5fdd36dba1ffb0239a4dfaaf1df91ff1aab	commit \| diff

Merge branch 'x86/cpu' into WIP.x86/core, to merge the NOP changes & resolve a semantic conflict

Conflict-merge this main commit in essence:

  a89dfde3dc3c: ("x86: Remove dynamic NOP selection")

With this upstream commit:

  b90829704780: ("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>

arch/x86/include/asm/cpufeatures.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/alternative.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/kprobes/core.c	diff1 \|	diff2 \|	blob \| history
arch/x86/net/bpf_jit_comp.c	diff1 \|	diff2 \|	blob \| history
tools/objtool/arch/x86/decode.c	diff1 \|	diff2 \|	blob \| history
tools/objtool/sync-check.sh	diff1 \|	diff2 \|	blob \| history