From: Greg Kroah-Hartman Date: Wed, 24 Aug 2022 06:20:10 +0000 (+0200) Subject: drop um-add-missing-apply_returns.patch from everywhere X-Git-Tag: v4.9.326~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1788ef4d028a9a4c564bda5e02c6eb5898b7162e;p=thirdparty%2Fkernel%2Fstable-queue.git drop um-add-missing-apply_returns.patch from everywhere --- diff --git a/queue-5.10/series b/queue-5.10/series index 25afb277507..e33fbb63ced 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -40,7 +40,6 @@ pinctrl-nomadik-fix-refcount-leak-in-nmk_pinctrl_dt_subnode_to_map.patch pinctrl-qcom-msm8916-allow-camss-gp-clocks-to-be-muxed.patch pinctrl-sunxi-add-i-o-bias-setting-for-h6-r-pio.patch pinctrl-qcom-sm8250-fix-pdc-map.patch -um-add-missing-apply_returns.patch acpi-property-return-type-of-acpi_add_nondev_subnodes-should-be-bool.patch geneve-do-not-use-rt_tos-for-ipv6-flowlabel.patch ipv6-do-not-use-rt_tos-for-ipv6-flowlabel.patch diff --git a/queue-5.10/um-add-missing-apply_returns.patch b/queue-5.10/um-add-missing-apply_returns.patch deleted file mode 100644 index fbbd44bba9a..00000000000 --- a/queue-5.10/um-add-missing-apply_returns.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 637285e7f8d6da70a70c64e7895cb0672357a1f7 Mon Sep 17 00:00:00 2001 -From: Peter Zijlstra -Date: Thu, 14 Jul 2022 12:20:19 +0200 -Subject: um: Add missing apply_returns() - -From: Peter Zijlstra - -commit 637285e7f8d6da70a70c64e7895cb0672357a1f7 upstream. - -Implement apply_returns() stub for UM, just like all the other patching -routines. - -Fixes: 15e67227c49a ("x86: Undo return-thunk damage") -Reported-by: Randy Dunlap -Signed-off-by: Richard Weinberger -Signed-off-by: Greg Kroah-Hartman ---- - arch/um/kernel/um_arch.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/arch/um/kernel/um_arch.c -+++ b/arch/um/kernel/um_arch.c -@@ -367,6 +367,10 @@ void apply_returns(s32 *start, s32 *end) - { - } - -+void apply_returns(s32 *start, s32 *end) -+{ -+} -+ - void apply_alternatives(struct alt_instr *start, struct alt_instr *end) - { - } diff --git a/queue-5.15/series b/queue-5.15/series index cc0c5964573..bbfd9a26d3f 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -66,7 +66,6 @@ pinctrl-amd-don-t-save-restore-interrupt-status-and-wake-status-bits.patch pinctrl-sunxi-add-i-o-bias-setting-for-h6-r-pio.patch pinctrl-qcom-sm8250-fix-pdc-map.patch input-exc3000-fix-return-value-check-of-wait_for_completion_timeout.patch -um-add-missing-apply_returns.patch octeontx2-pf-fix-nix_af_tl3_tl2x_linkx_cfg-register-configuration.patch octeontx2-af-apply-tx-nibble-fixup-always.patch octeontx2-af-suppress-external-profile-loading-warning.patch diff --git a/queue-5.15/um-add-missing-apply_returns.patch b/queue-5.15/um-add-missing-apply_returns.patch deleted file mode 100644 index 1560966e3a4..00000000000 --- a/queue-5.15/um-add-missing-apply_returns.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 637285e7f8d6da70a70c64e7895cb0672357a1f7 Mon Sep 17 00:00:00 2001 -From: Peter Zijlstra -Date: Thu, 14 Jul 2022 12:20:19 +0200 -Subject: um: Add missing apply_returns() - -From: Peter Zijlstra - -commit 637285e7f8d6da70a70c64e7895cb0672357a1f7 upstream. - -Implement apply_returns() stub for UM, just like all the other patching -routines. - -Fixes: 15e67227c49a ("x86: Undo return-thunk damage") -Reported-by: Randy Dunlap -Signed-off-by: Richard Weinberger -Signed-off-by: Greg Kroah-Hartman ---- - arch/um/kernel/um_arch.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/arch/um/kernel/um_arch.c -+++ b/arch/um/kernel/um_arch.c -@@ -437,6 +437,10 @@ void apply_returns(s32 *start, s32 *end) - { - } - -+void apply_returns(s32 *start, s32 *end) -+{ -+} -+ - void apply_alternatives(struct alt_instr *start, struct alt_instr *end) - { - } diff --git a/queue-5.19/series b/queue-5.19/series index e9dd4a91d6e..3e03f9eb108 100644 --- a/queue-5.19/series +++ b/queue-5.19/series @@ -110,7 +110,6 @@ input-iqs7222-remove-support-for-rf-filter.patch dt-bindings-input-iqs7222-remove-support-for-rf-filter.patch dt-bindings-input-iqs7222-correct-bottom-speed-step-size.patch dt-bindings-input-iqs7222-extend-slider-mapped-gpio-to-iqs7222c.patch -um-add-missing-apply_returns.patch octeontx2-pf-fix-nix_af_tl3_tl2x_linkx_cfg-register-configuration.patch octeontx2-af-apply-tx-nibble-fixup-always.patch octeontx2-af-suppress-external-profile-loading-warning.patch diff --git a/queue-5.19/um-add-missing-apply_returns.patch b/queue-5.19/um-add-missing-apply_returns.patch deleted file mode 100644 index fb57e75a7a9..00000000000 --- a/queue-5.19/um-add-missing-apply_returns.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 637285e7f8d6da70a70c64e7895cb0672357a1f7 Mon Sep 17 00:00:00 2001 -From: Peter Zijlstra -Date: Thu, 14 Jul 2022 12:20:19 +0200 -Subject: um: Add missing apply_returns() - -From: Peter Zijlstra - -commit 637285e7f8d6da70a70c64e7895cb0672357a1f7 upstream. - -Implement apply_returns() stub for UM, just like all the other patching -routines. - -Fixes: 15e67227c49a ("x86: Undo return-thunk damage") -Reported-by: Randy Dunlap -Signed-off-by: Richard Weinberger -Signed-off-by: Greg Kroah-Hartman ---- - arch/um/kernel/um_arch.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/arch/um/kernel/um_arch.c -+++ b/arch/um/kernel/um_arch.c -@@ -444,6 +444,10 @@ void apply_returns(s32 *start, s32 *end) - { - } - -+void apply_returns(s32 *start, s32 *end) -+{ -+} -+ - void apply_alternatives(struct alt_instr *start, struct alt_instr *end) - { - }