Merge branch 'x86/core'

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/boot/compressed/sev-es.c
Simple merge

diff --cc arch/x86/include/asm/cpufeatures.h
Simple merge

diff --cc arch/x86/include/asm/jump_label.h
index 7f2006645d8402ca5b7773727471336a6436885a,5ce342b91ff3e5e8b17fc516615e624f4f6b50fb..610a05374c02fff37212e97131ffd4f786231e31
--- 1/arch/x86/include/asm/jump_label.h
--- 2/arch/x86/include/asm/jump_label.h
+++ b/arch/x86/include/asm/jump_label.h
@@@ -20,10 -14,10 +14,10 @@@
  #include <linux/stringify.h>
  #include <linux/types.h>
  
 -static __always_inline bool arch_static_branch(struct static_key *key, bool branch)
 +static __always_inline bool arch_static_branch(struct static_key * const key, const bool branch)
  {
        asm_volatile_goto("1:"
-               ".byte " __stringify(STATIC_KEY_INIT_NOP) "\n\t"
+               ".byte " __stringify(BYTES_NOP5) "\n\t"
                ".pushsection __jump_table,  \"aw\" \n\t"
                _ASM_ALIGN "\n\t"
                ".long 1b - ., %l[l_yes] - . \n\t"

diff --cc arch/x86/include/asm/paravirt.h
Simple merge

diff --cc arch/x86/include/asm/paravirt_types.h
Simple merge

diff --cc arch/x86/kernel/alternative.c
Simple merge

diff --cc arch/x86/kernel/cpu/common.c
Simple merge

diff --cc arch/x86/kernel/cpu/vmware.c
Simple merge

diff --cc arch/x86/kernel/kvm.c
Simple merge

diff --cc arch/x86/kernel/paravirt.c
Simple merge

diff --cc arch/x86/kernel/setup.c
Simple merge

diff --cc arch/x86/kernel/sev-es.c
Simple merge

diff --cc arch/x86/kernel/traps.c
Simple merge

diff --cc arch/x86/net/bpf_jit_comp.c
Simple merge