diff options
| author | Ingo Molnar <[email protected]> | 2021-04-02 12:33:16 +0200 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2021-04-02 12:33:16 +0200 |
| commit | e855e80d001530ec0bbb1ee1ca6a16ac6bdf9acf (patch) | |
| tree | 5f762f2992658891c565af4f923147b384bf0dd4 /net/lapb/lapb_subr.c | |
| parent | f2ac256b9a8b7e79847efcd82bd10fd876369b9f (diff) | |
| parent | a5e13c6df0e41702d2b2c77c8ad41677ebb065b3 (diff) | |
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 <[email protected]>
Diffstat (limited to 'net/lapb/lapb_subr.c')
0 files changed, 0 insertions, 0 deletions