Merge branch 'x86/bugs' into x86/core, to pick up pending changes before dependent...

Merge in pending alternatives patching infrastructure changes, before
applying more patches.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/Makefile
Simple merge

diff --cc arch/x86/entry/calling.h
Simple merge

diff --cc arch/x86/entry/entry_64.S
Simple merge

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

diff --cc arch/x86/include/asm/nospec-branch.h
index 691ff1ef701b623b8d671ea89b9b258cd25562be,55754617eaee88406217a0af6bff5b6c3a5cd97c..8bd8ed576f91fc4424a2013dca4c9b23a4681a89
--- 1/arch/x86/include/asm/nospec-branch.h
--- 2/arch/x86/include/asm/nospec-branch.h
+++ b/arch/x86/include/asm/nospec-branch.h
@@@ -300,9 -309,9 +300,9 @@@
  
  
  .macro CALL_DEPTH_ACCOUNT
- #ifdef CONFIG_CALL_DEPTH_TRACKING
+ #ifdef CONFIG_MITIGATION_CALL_DEPTH_TRACKING
        ALTERNATIVE "",                                                 \
 -                  __stringify(ASM_INCREMENT_CALL_DEPTH), X86_FEATURE_CALL_DEPTH
 +                  __stringify(INCREMENT_CALL_DEPTH), X86_FEATURE_CALL_DEPTH
  #endif
  .endm
  

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

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

diff --cc arch/x86/kernel/head_64.S
Simple merge

diff --cc arch/x86/kernel/vmlinux.lds.S
Simple merge

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

diff --cc arch/x86/kvm/mmu/mmu_internal.h
Simple merge

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

diff --cc arch/x86/kvm/svm/vmenter.S
Simple merge

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

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

diff --cc include/linux/compiler-gcc.h
Simple merge

diff --cc include/linux/indirect_call_wrapper.h
Simple merge

diff --cc include/linux/module.h
Simple merge

diff --cc include/net/tc_wrapper.h
Simple merge

diff --cc kernel/trace/ring_buffer.c
Simple merge

diff --cc net/netfilter/nft_ct.c
Simple merge

diff --cc net/sched/sch_api.c
Simple merge

diff --cc scripts/Makefile.lib
Simple merge

diff --cc scripts/generate_rust_target.rs
Simple merge

diff --cc scripts/mod/modpost.c
Simple merge