From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 23 Aug 2023 16:01:55 +0000 (+0200)
Subject: move x86 patches back in place for 6.1
X-Git-Tag: v6.1.48~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e05bd667004bacccf923fbaf7d1399ef38ba63f5;p=thirdparty%2Fkernel%2Fstable-queue.git

move x86 patches back in place for 6.1
---

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