Merge branch 'master' of gitolite.kernel.org:/pub/scm/linux/kernel/git/stable/stable...

diff --cc queue-5.15/documentation-hw-vuln-add-documentation-for-cross-thread-return-predictions.patch
index a1543b77947f936c8f3bb1d6cc820757dd8c3216,637db39f3204e7a795b6c3be389b33e283bdef59..d6938a4598ed3fe9e502b31e4f1c9004f167f34c
--- 1/queue-5.15/documentation-hw-vuln-add-documentation-for-cross-thread-return-predictions.patch
--- 2/queue-6.1/documentation-hw-vuln-add-documentation-for-cross-th.patch
+++ b/queue-5.15/documentation-hw-vuln-add-documentation-for-cross-thread-return-predictions.patch
@@@ -12,10 -13,10 +12,11 @@@ Add the admin guide for the Cross-Threa
  Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
  Message-Id: <60f9c0b4396956ce70499ae180cb548720b25c7e.1675956146.git.thomas.lendacky@amd.com>
  Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+ Signed-off-by: Sasha Levin <sashal@kernel.org>
 +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  ---
 - .../admin-guide/hw-vuln/cross-thread-rsb.rst  | 92 +++++++++++++++++++
 - Documentation/admin-guide/hw-vuln/index.rst   |  1 +
 + Documentation/admin-guide/hw-vuln/cross-thread-rsb.rst |   92 +++++++++++++++++
 + Documentation/admin-guide/hw-vuln/index.rst            |    1 
   2 files changed, 93 insertions(+)
   create mode 100644 Documentation/admin-guide/hw-vuln/cross-thread-rsb.rst
  

diff --cc queue-5.15/kvm-x86-mitigate-the-cross-thread-return-address-predictions-bug.patch
index b5ce60ddf11475d5ab5519a598e3f463adedd6cd,8c7327a89e868486be0c8c3dcbdcfcbfd47ee5f8..1f790158bdae82462eb19918f4a7daef0abf8a13
--- 1/queue-5.15/kvm-x86-mitigate-the-cross-thread-return-address-predictions-bug.patch
--- 2/queue-5.15/kvm-x86-mitigate-the-cross-thread-return-address-pre.patch
+++ b/queue-5.15/kvm-x86-mitigate-the-cross-thread-return-address-predictions-bug.patch
@@@ -21,14 -21,16 +21,15 @@@ KVM will not allow the disabling of th
  Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
  Message-Id: <4019348b5e07148eb4d593380a5f6713b93c9a16.1675956146.git.thomas.lendacky@amd.com>
  Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+ Signed-off-by: Sasha Levin <sashal@kernel.org>
 +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  ---
 - arch/x86/kvm/x86.c | 43 ++++++++++++++++++++++++++++++++-----------
 + arch/x86/kvm/x86.c |   43 ++++++++++++++++++++++++++++++++-----------
   1 file changed, 32 insertions(+), 11 deletions(-)
  
 -diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
 -index fcfa3fedf84f1..45a3d11bb70d9 100644
  --- a/arch/x86/kvm/x86.c
  +++ b/arch/x86/kvm/x86.c
 -@@ -184,6 +184,10 @@ module_param(force_emulation_prefix, bool, S_IRUGO);
 +@@ -184,6 +184,10 @@ module_param(force_emulation_prefix, boo
   int __read_mostly pi_inject_timer = -1;
   module_param(pi_inject_timer, bint, S_IRUGO | S_IWUSR);
   

diff --cc queue-5.15/series
index 01d55ecbb6f97b13673f58b69b4bc1c9a157929d,dd9e664cdc2769f9e630b7eb1e5b800ef1897f31..a692b63a2babb2d8814e9ff3a5bc01125df35caf
--- 1/queue-5.15/series
--- 2/queue-5.15/series
+++ b/queue-5.15/series
@@@ -61,7 -61,6 +61,6 @@@ fix-page-corruption-caused-by-racy-chec
  drm-amdgpu-fence-fix-oops-due-to-non-matching-drm_sched-init-fini.patch
  drm-i915-initialize-the-obj-flags-for-shmem-objects.patch
  drm-i915-fix-vbt-dsi-dvo-port-handling.patch
- nvmem-core-fix-return-value.patch
 -x86-speculation-identify-processors-vulnerable-to-sm.patch
 -kvm-x86-mitigate-the-cross-thread-return-address-pre.patch
 -documentation-hw-vuln-add-documentation-for-cross-th.patch
 +x86-speculation-identify-processors-vulnerable-to-smt-rsb-predictions.patch
 +kvm-x86-mitigate-the-cross-thread-return-address-predictions-bug.patch
 +documentation-hw-vuln-add-documentation-for-cross-thread-return-predictions.patch

diff --cc queue-5.15/x86-speculation-identify-processors-vulnerable-to-smt-rsb-predictions.patch
index e2d32d658293df311a3912f0cec1f72e65726a6c,2ec96733250a30493e7be263db49ecfeb83920be..d68f39824e3a509b6c3d161f760bb0f6a6faa83c
--- 1/queue-5.15/x86-speculation-identify-processors-vulnerable-to-smt-rsb-predictions.patch
--- 2/queue-5.15/x86-speculation-identify-processors-vulnerable-to-sm.patch
+++ b/queue-5.15/x86-speculation-identify-processors-vulnerable-to-smt-rsb-predictions.patch
@@@ -22,12 -23,14 +22,13 @@@ Reviewed-by: Borislav Petkov (AMD) <bp@
  Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
  Message-Id: <91cec885656ca1fcd4f0185ce403a53dd9edecb7.1675956146.git.thomas.lendacky@amd.com>
  Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+ Signed-off-by: Sasha Levin <sashal@kernel.org>
 +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  ---
 - arch/x86/include/asm/cpufeatures.h | 1 +
 - arch/x86/kernel/cpu/common.c       | 9 +++++++--
 + arch/x86/include/asm/cpufeatures.h |    1 +
 + arch/x86/kernel/cpu/common.c       |    9 +++++++--
   2 files changed, 8 insertions(+), 2 deletions(-)
  
 -diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h
 -index f3cb8c8bf8d9c..e31c7e75d6b02 100644
  --- a/arch/x86/include/asm/cpufeatures.h
  +++ b/arch/x86/include/asm/cpufeatures.h
  @@ -452,5 +452,6 @@

diff --cc queue-6.1/documentation-hw-vuln-add-documentation-for-cross-thread-return-predictions.patch
index a1543b77947f936c8f3bb1d6cc820757dd8c3216,e68bfc01a8c98e4c3a52a04c0457f5b85aa3c312..d6938a4598ed3fe9e502b31e4f1c9004f167f34c
--- 1/queue-6.1/documentation-hw-vuln-add-documentation-for-cross-thread-return-predictions.patch
--- 2/queue-5.15/documentation-hw-vuln-add-documentation-for-cross-th.patch
+++ b/queue-6.1/documentation-hw-vuln-add-documentation-for-cross-thread-return-predictions.patch
@@@ -12,10 -13,10 +12,11 @@@ Add the admin guide for the Cross-Threa
  Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
  Message-Id: <60f9c0b4396956ce70499ae180cb548720b25c7e.1675956146.git.thomas.lendacky@amd.com>
  Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+ Signed-off-by: Sasha Levin <sashal@kernel.org>
 +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  ---
 - .../admin-guide/hw-vuln/cross-thread-rsb.rst  | 92 +++++++++++++++++++
 - Documentation/admin-guide/hw-vuln/index.rst   |  1 +
 + Documentation/admin-guide/hw-vuln/cross-thread-rsb.rst |   92 +++++++++++++++++
 + Documentation/admin-guide/hw-vuln/index.rst            |    1 
   2 files changed, 93 insertions(+)
   create mode 100644 Documentation/admin-guide/hw-vuln/cross-thread-rsb.rst
  

diff --cc queue-6.1/kvm-x86-mitigate-the-cross-thread-return-address-predictions-bug.patch
index d792758d272708dd0409100478ecf37000c70ff2,f61a20ac3aa76d43331b2bc859aac0c2a1977409..5f232a46f78842cc6aa735f52f4b67ff31dd41ab
--- 1/queue-6.1/kvm-x86-mitigate-the-cross-thread-return-address-predictions-bug.patch
--- 2/queue-6.1/kvm-x86-mitigate-the-cross-thread-return-address-pre.patch
+++ b/queue-6.1/kvm-x86-mitigate-the-cross-thread-return-address-predictions-bug.patch
@@@ -21,11 -21,13 +21,12 @@@ KVM will not allow the disabling of th
  Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
  Message-Id: <4019348b5e07148eb4d593380a5f6713b93c9a16.1675956146.git.thomas.lendacky@amd.com>
  Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+ Signed-off-by: Sasha Levin <sashal@kernel.org>
 +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  ---
 - arch/x86/kvm/x86.c | 43 ++++++++++++++++++++++++++++++++-----------
 + arch/x86/kvm/x86.c |   43 ++++++++++++++++++++++++++++++++-----------
   1 file changed, 32 insertions(+), 11 deletions(-)
  
 -diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
 -index 69227f77b201d..a0c35b948c30b 100644
  --- a/arch/x86/kvm/x86.c
  +++ b/arch/x86/kvm/x86.c
  @@ -192,6 +192,10 @@ module_param(enable_pmu, bool, 0444);

diff --cc queue-6.1/x86-speculation-identify-processors-vulnerable-to-smt-rsb-predictions.patch
index 78f2acc02ecb3cbce12e3835de5d35158fefe6aa,6db9ce4f58b98420b4bb15e3629bcc9a19fe66d5..c3716eb48a44bd24991749314833a62f113b8b2b
--- 1/queue-6.1/x86-speculation-identify-processors-vulnerable-to-smt-rsb-predictions.patch
--- 2/queue-6.1/x86-speculation-identify-processors-vulnerable-to-sm.patch
+++ b/queue-6.1/x86-speculation-identify-processors-vulnerable-to-smt-rsb-predictions.patch
@@@ -22,12 -23,14 +22,13 @@@ Reviewed-by: Borislav Petkov (AMD) <bp@
  Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
  Message-Id: <91cec885656ca1fcd4f0185ce403a53dd9edecb7.1675956146.git.thomas.lendacky@amd.com>
  Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+ Signed-off-by: Sasha Levin <sashal@kernel.org>
 +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  ---
 - arch/x86/include/asm/cpufeatures.h | 1 +
 - arch/x86/kernel/cpu/common.c       | 9 +++++++--
 + arch/x86/include/asm/cpufeatures.h |    1 +
 + arch/x86/kernel/cpu/common.c       |    9 +++++++--
   2 files changed, 8 insertions(+), 2 deletions(-)
  
 -diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h
 -index b2da7cb64b317..92729c38853d1 100644
  --- a/arch/x86/include/asm/cpufeatures.h
  +++ b/arch/x86/include/asm/cpufeatures.h
  @@ -463,5 +463,6 @@