From: Ingo Molnar Date: Fri, 2 Apr 2021 10:33:16 +0000 (+0200) Subject: Merge tag 'v5.12-rc5' into WIP.x86/core, to pick up recent NOP related changes X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e855e80d001530ec0bbb1ee1ca6a16ac6bdf9acf;p=linux.git 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 --- e855e80d001530ec0bbb1ee1ca6a16ac6bdf9acf