diff options
author | Ingo Molnar <mingo@kernel.org> | 2024-04-06 13:00:32 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2024-04-06 13:00:32 +0200 |
commit | 5f2ca44ed235c86a0d6b9bfb599d1664ea94b4b9 (patch) | |
tree | 0475ba937cecc36b1e38afcd0f3babba23092aba /mm/mmap.c | |
parent | 3ddf944b32f88741c303f0b21459dbb3872b8bc5 (diff) | |
parent | 6c6e47d69d821047097909288b6d7f1aafb3b9b1 (diff) |
Merge branch 'linus' into x86/urgent, to pick up dependent commit
We want to fix:
0e110732473e ("x86/retpoline: Do the necessary fixup to the Zen3/4 srso return thunk for !SRSO")
So merge in Linus's latest into x86/urgent to have it available.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/mmap.c')
0 files changed, 0 insertions, 0 deletions