Merge tag 'v5.12-rc5' into WIP.x86/core, to pick up recent NOP related changes
authorIngo Molnar <mingo@kernel.org>
Fri, 2 Apr 2021 10:33:16 +0000 (12:33 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 2 Apr 2021 10:33:16 +0000 (12:33 +0200)
commite855e80d001530ec0bbb1ee1ca6a16ac6bdf9acf
tree5f762f2992658891c565af4f923147b384bf0dd4
parentf2ac256b9a8b7e79847efcd82bd10fd876369b9f
parenta5e13c6df0e41702d2b2c77c8ad41677ebb065b3
Merge tag 'v5.12-rc5' into WIP.x86/core, to pick up recent NOP related changes

In particular we want to have this upstream commit:

  b90829704780: ("bpf: Use NOP_ATOMIC5 instead of emit_nops(&prog, 5) for BPF_TRAMP_F_CALL_ORIG")

... before merging in x86/cpu changes and the removal of the NOP optimizations, and
applying PeterZ's !retpoline objtool series.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/Makefile
arch/x86/events/intel/ds.c
arch/x86/include/asm/processor.h
arch/x86/kernel/kvm.c
arch/x86/mm/mem_encrypt.c