move x86 patches out of the way for 6.1 release

It's a mess...

diff --git a/queue-6.1/series b/queue-6.1/series
index 7930001618252fa5244452edfd1f5814c30acf70..9da73acaae9d1e4eb08fc72573dc3555c2cf0beb 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -169,21 +169,6 @@ sched-fair-remove-capacity-inversion-detection.patch
 drm-amd-display-implement-workaround-for-writing-to-otg_pixel_rate_div-register.patch
 hugetlb-do-not-clear-hugetlb-dtor-until-allocating-vmemmap.patch
 netfilter-set-default-timeout-to-3-secs-for-sctp-shutdown-send-and-recv-state.patch
-x86-cpu-fix-__x86_return_thunk-symbol-type.patch
-x86-cpu-fix-up-srso_safe_ret-and-__x86_return_thunk.patch
-x86-alternative-make-custom-return-thunk-unconditional.patch
-x86-cpu-clean-up-srso-return-thunk-mess.patch
-x86-cpu-rename-original-retbleed-methods.patch
-x86-cpu-rename-srso_-.-_alias-to-srso_alias_-1.patch
-x86-cpu-cleanup-the-untrain-mess.patch
-x86-srso-explain-the-untraining-sequences-a-bit-more.patch
-x86-static_call-fix-__static_call_fixup.patch
-x86-retpoline-don-t-clobber-rflags-during-srso_safe_ret.patch
-x86-cpu-amd-fix-the-div-0-initial-fix-attempt.patch
-x86-srso-disable-the-mitigation-on-unaffected-configurations.patch
-x86-retpoline-kprobes-fix-position-of-thunk-sections-with-config_lto_clang.patch
-objtool-x86-fixup-frame-pointer-vs-rethunk.patch
-x86-srso-correct-the-mitigation-status-when-smt-is-disabled.patch
 arm64-ptrace-ensure-that-sme-is-set-up-for-target-when-writing-ssve-state.patch
 drm-amd-pm-skip-the-rlc-stop-when-s0i3-suspend-for-smu-v13.0.4-11.patch
 drm-amdgpu-keep-irq-count-in-amdgpu_irq_disable_all.patch

diff --git a/queue-6.1/objtool-x86-fixup-frame-pointer-vs-rethunk.patch b/temp-6.1/objtool-x86-fixup-frame-pointer-vs-rethunk.patch
similarity index 100%
rename from queue-6.1/objtool-x86-fixup-frame-pointer-vs-rethunk.patch
rename to temp-6.1/objtool-x86-fixup-frame-pointer-vs-rethunk.patch

diff --git a/temp-6.1/series b/temp-6.1/series
new file mode 100644 (file)
index 0000000..8c81791
--- /dev/null
+++ b/temp-6.1/series
@@ -0,0 +1,15 @@
+x86-cpu-fix-__x86_return_thunk-symbol-type.patch
+x86-cpu-fix-up-srso_safe_ret-and-__x86_return_thunk.patch
+x86-alternative-make-custom-return-thunk-unconditional.patch
+x86-cpu-clean-up-srso-return-thunk-mess.patch
+x86-cpu-rename-original-retbleed-methods.patch
+x86-cpu-rename-srso_-.-_alias-to-srso_alias_-1.patch
+x86-cpu-cleanup-the-untrain-mess.patch
+x86-srso-explain-the-untraining-sequences-a-bit-more.patch
+x86-static_call-fix-__static_call_fixup.patch
+x86-retpoline-don-t-clobber-rflags-during-srso_safe_ret.patch
+x86-cpu-amd-fix-the-div-0-initial-fix-attempt.patch
+x86-srso-disable-the-mitigation-on-unaffected-configurations.patch
+x86-retpoline-kprobes-fix-position-of-thunk-sections-with-config_lto_clang.patch
+objtool-x86-fixup-frame-pointer-vs-rethunk.patch
+x86-srso-correct-the-mitigation-status-when-smt-is-disabled.patch

diff --git a/queue-6.1/x86-alternative-make-custom-return-thunk-unconditional.patch b/temp-6.1/x86-alternative-make-custom-return-thunk-unconditional.patch
similarity index 100%
rename from queue-6.1/x86-alternative-make-custom-return-thunk-unconditional.patch
rename to temp-6.1/x86-alternative-make-custom-return-thunk-unconditional.patch

diff --git a/queue-6.1/x86-cpu-amd-fix-the-div-0-initial-fix-attempt.patch b/temp-6.1/x86-cpu-amd-fix-the-div-0-initial-fix-attempt.patch
similarity index 100%
rename from queue-6.1/x86-cpu-amd-fix-the-div-0-initial-fix-attempt.patch
rename to temp-6.1/x86-cpu-amd-fix-the-div-0-initial-fix-attempt.patch

diff --git a/queue-6.1/x86-cpu-clean-up-srso-return-thunk-mess.patch b/temp-6.1/x86-cpu-clean-up-srso-return-thunk-mess.patch
similarity index 100%
rename from queue-6.1/x86-cpu-clean-up-srso-return-thunk-mess.patch
rename to temp-6.1/x86-cpu-clean-up-srso-return-thunk-mess.patch

diff --git a/queue-6.1/x86-cpu-cleanup-the-untrain-mess.patch b/temp-6.1/x86-cpu-cleanup-the-untrain-mess.patch
similarity index 100%
rename from queue-6.1/x86-cpu-cleanup-the-untrain-mess.patch
rename to temp-6.1/x86-cpu-cleanup-the-untrain-mess.patch

diff --git a/queue-6.1/x86-cpu-fix-__x86_return_thunk-symbol-type.patch b/temp-6.1/x86-cpu-fix-__x86_return_thunk-symbol-type.patch
similarity index 100%
rename from queue-6.1/x86-cpu-fix-__x86_return_thunk-symbol-type.patch
rename to temp-6.1/x86-cpu-fix-__x86_return_thunk-symbol-type.patch

diff --git a/queue-6.1/x86-cpu-fix-up-srso_safe_ret-and-__x86_return_thunk.patch b/temp-6.1/x86-cpu-fix-up-srso_safe_ret-and-__x86_return_thunk.patch
similarity index 100%
rename from queue-6.1/x86-cpu-fix-up-srso_safe_ret-and-__x86_return_thunk.patch
rename to temp-6.1/x86-cpu-fix-up-srso_safe_ret-and-__x86_return_thunk.patch

diff --git a/queue-6.1/x86-cpu-rename-original-retbleed-methods.patch b/temp-6.1/x86-cpu-rename-original-retbleed-methods.patch
similarity index 100%
rename from queue-6.1/x86-cpu-rename-original-retbleed-methods.patch
rename to temp-6.1/x86-cpu-rename-original-retbleed-methods.patch

diff --git a/queue-6.1/x86-cpu-rename-srso_-.-_alias-to-srso_alias_-1.patch b/temp-6.1/x86-cpu-rename-srso_-.-_alias-to-srso_alias_-1.patch
similarity index 100%
rename from queue-6.1/x86-cpu-rename-srso_-.-_alias-to-srso_alias_-1.patch
rename to temp-6.1/x86-cpu-rename-srso_-.-_alias-to-srso_alias_-1.patch

diff --git a/queue-6.1/x86-retpoline-don-t-clobber-rflags-during-srso_safe_ret.patch b/temp-6.1/x86-retpoline-don-t-clobber-rflags-during-srso_safe_ret.patch
similarity index 100%
rename from queue-6.1/x86-retpoline-don-t-clobber-rflags-during-srso_safe_ret.patch
rename to temp-6.1/x86-retpoline-don-t-clobber-rflags-during-srso_safe_ret.patch

diff --git a/queue-6.1/x86-retpoline-kprobes-fix-position-of-thunk-sections-with-config_lto_clang.patch b/temp-6.1/x86-retpoline-kprobes-fix-position-of-thunk-sections-with-config_lto_clang.patch
similarity index 100%
rename from queue-6.1/x86-retpoline-kprobes-fix-position-of-thunk-sections-with-config_lto_clang.patch
rename to temp-6.1/x86-retpoline-kprobes-fix-position-of-thunk-sections-with-config_lto_clang.patch

diff --git a/queue-6.1/x86-srso-correct-the-mitigation-status-when-smt-is-disabled.patch b/temp-6.1/x86-srso-correct-the-mitigation-status-when-smt-is-disabled.patch
similarity index 100%
rename from queue-6.1/x86-srso-correct-the-mitigation-status-when-smt-is-disabled.patch
rename to temp-6.1/x86-srso-correct-the-mitigation-status-when-smt-is-disabled.patch

diff --git a/queue-6.1/x86-srso-disable-the-mitigation-on-unaffected-configurations.patch b/temp-6.1/x86-srso-disable-the-mitigation-on-unaffected-configurations.patch
similarity index 100%
rename from queue-6.1/x86-srso-disable-the-mitigation-on-unaffected-configurations.patch
rename to temp-6.1/x86-srso-disable-the-mitigation-on-unaffected-configurations.patch

diff --git a/queue-6.1/x86-srso-explain-the-untraining-sequences-a-bit-more.patch b/temp-6.1/x86-srso-explain-the-untraining-sequences-a-bit-more.patch
similarity index 100%
rename from queue-6.1/x86-srso-explain-the-untraining-sequences-a-bit-more.patch
rename to temp-6.1/x86-srso-explain-the-untraining-sequences-a-bit-more.patch

diff --git a/queue-6.1/x86-static_call-fix-__static_call_fixup.patch b/temp-6.1/x86-static_call-fix-__static_call_fixup.patch
similarity index 100%
rename from queue-6.1/x86-static_call-fix-__static_call_fixup.patch
rename to temp-6.1/x86-static_call-fix-__static_call_fixup.patch