Hi Linus,
please pull x86/alternatives for v6.10-rc1.
You might encounter an easy peasy merge conflict which you can resolve
by simply zapping alternative_input_2(), i.e., what
8dc8b02d707e ("x86/alternatives: Remove alternative_input_2()")
does.
Thx.
---
The following changes since commit fec50db7033ea478773b159e0e2efb135270e3b7:
Linux 6.9-rc3 (2024-04-07 13:22:46 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip x86_alternatives_for_v6.10_rc1
for you to fetch changes up to 8dc8b02d707ee4167fffaf3a97003bcdac282876:
x86/alternatives: Remove alternative_input_2() (2024-05-06 14:30:54 +0200)
----------------------------------------------------------------
- Switch the in-place instruction patching which lead to at least one weird bug
with 32-bit guests, seeing stale instruction bytes, to one working on
a buffer, like the rest of the alternatives code does
- Add a long overdue check to the X86_FEATURE flag modifying functions to warn
when former get changed in a non-compatible way after alternatives have been
patched because those changes will be already wrong
- Other cleanups
----------------------------------------------------------------
Borislav Petkov (AMD) (6):
x86/alternatives: Catch late X86_FEATURE modifiers
x86/alternatives: Use a temporary buffer when optimizing NOPs
x86/alternatives: Get rid of __optimize_nops()
x86/alternatives: Optimize optimize_nops()
x86/alternatives: Sort local vars in apply_alternatives()
x86/alternatives: Remove alternative_input_2()
arch/x86/include/asm/alternative.h | 14 ----
arch/x86/include/asm/cpufeature.h | 8 ++-
arch/x86/include/asm/text-patching.h | 2 +-
arch/x86/kernel/alternative.c | 133 +++++++++++++++--------------------
arch/x86/kernel/callthunks.c | 9 +--
arch/x86/kernel/cpu/cpuid-deps.c | 3 +
6 files changed, 71 insertions(+), 98 deletions(-)
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
The pull request you sent on Mon, 13 May 2024 19:40:42 +0200:
> git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip x86_alternatives_for_v6.10_rc1
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/25c7cb05fa61078d99d56fda36bd6d0a1638139d
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html