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:

  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>

2021-04-02 12:36:30 +02:00

..

common.h

x86/stackframe/32: Provide consistent pt_regs

2019-06-25 10:23:47 +02:00

core.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

ftrace.c

ftrace: Fix spelling mistake "disabed" -> "disabled"

2021-03-16 21:19:40 -07:00

Makefile

treewide: Add SPDX license identifier - Makefile/Kconfig

2019-05-21 10:50:46 +02:00

opt.c

x86: Add insn_decode_kernel()

2021-03-31 16:20:22 +02:00