drop queue-4.14/clk-unlink-clock-if-failed-to-prepare-or-enable.patch queue-4.9/clk...

diff --git a/queue-4.14/clk-unlink-clock-if-failed-to-prepare-or-enable.patch b/queue-4.14/clk-unlink-clock-if-failed-to-prepare-or-enable.patch
deleted file mode 100644 (file)
index 1613453..0000000
--- a/queue-4.14/clk-unlink-clock-if-failed-to-prepare-or-enable.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 018d4671b9bbd4a5c55cf6eab3e1dbc70a50b66e Mon Sep 17 00:00:00 2001
-From: Marc Zyngier <maz@kernel.org>
-Date: Tue, 5 May 2020 15:09:53 +0100
-Subject: clk: Unlink clock if failed to prepare or enable
-
-From: Marc Zyngier <maz@kernel.org>
-
-commit 018d4671b9bbd4a5c55cf6eab3e1dbc70a50b66e upstream.
-
-On failing to prepare or enable a clock, remove the core structure
-from the list it has been inserted as it is about to be freed.
-
-This otherwise leads to random crashes when subsequent clocks get
-registered, during which parsing of the clock tree becomes adventurous.
-
-Observed with QEMU's RPi-3 emulation.
-
-Fixes: 12ead77432f2 ("clk: Don't try to enable critical clocks if prepare failed")
-Signed-off-by: Marc Zyngier <maz@kernel.org>
-Cc: Guenter Roeck <linux@roeck-us.net>
-Cc: Stephen Boyd <sboyd@kernel.org>
-Cc: Michael Turquette <mturquette@baylibre.com>
-Link: https://lkml.kernel.org/r/20200505140953.409430-1-maz@kernel.org
-Signed-off-by: Stephen Boyd <sboyd@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/clk/clk.c |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/clk/clk.c
-+++ b/drivers/clk/clk.c
-@@ -2780,6 +2780,9 @@ void clk_unregister(struct clk *clk)
-                                       __func__, clk->core->name);
-       kref_put(&clk->core->ref, __clk_release);
- unlock:
-+      if (ret)
-+              hlist_del_init(&core->child_node);
-+
-       clk_prepare_unlock();
- }
- EXPORT_SYMBOL_GPL(clk_unregister);

diff --git a/queue-4.14/series b/queue-4.14/series
index 0897a64c9738b9656646e6f427e2ac691c14541a..b4b625b6d6f38631b27f274a87119e94e9b0fd66 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -106,7 +106,6 @@ usb-gadget-audio-fix-a-missing-error-return-value-in-audio_bind.patch
 usb-gadget-legacy-fix-error-return-code-in-gncm_bind.patch
 usb-gadget-legacy-fix-error-return-code-in-cdc_bind.patch
 revert-alsa-hda-realtek-fix-pop-noise-on-alc225.patch
-clk-unlink-clock-if-failed-to-prepare-or-enable.patch
 arm64-dts-rockchip-replace-rk805-pmic-node-name-with-pmic-on-rk3328-boards.patch
 arm64-dts-rockchip-rename-dwc3-device-nodes-on-rk3399-to-make-dtc-happy.patch
 arm-dts-r8a73a4-add-missing-cmt1-interrupts.patch

diff --git a/queue-4.9/clk-unlink-clock-if-failed-to-prepare-or-enable.patch b/queue-4.9/clk-unlink-clock-if-failed-to-prepare-or-enable.patch
deleted file mode 100644 (file)
index ff76e24..0000000
--- a/queue-4.9/clk-unlink-clock-if-failed-to-prepare-or-enable.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 018d4671b9bbd4a5c55cf6eab3e1dbc70a50b66e Mon Sep 17 00:00:00 2001
-From: Marc Zyngier <maz@kernel.org>
-Date: Tue, 5 May 2020 15:09:53 +0100
-Subject: clk: Unlink clock if failed to prepare or enable
-
-From: Marc Zyngier <maz@kernel.org>
-
-commit 018d4671b9bbd4a5c55cf6eab3e1dbc70a50b66e upstream.
-
-On failing to prepare or enable a clock, remove the core structure
-from the list it has been inserted as it is about to be freed.
-
-This otherwise leads to random crashes when subsequent clocks get
-registered, during which parsing of the clock tree becomes adventurous.
-
-Observed with QEMU's RPi-3 emulation.
-
-Fixes: 12ead77432f2 ("clk: Don't try to enable critical clocks if prepare failed")
-Signed-off-by: Marc Zyngier <maz@kernel.org>
-Cc: Guenter Roeck <linux@roeck-us.net>
-Cc: Stephen Boyd <sboyd@kernel.org>
-Cc: Michael Turquette <mturquette@baylibre.com>
-Link: https://lkml.kernel.org/r/20200505140953.409430-1-maz@kernel.org
-Signed-off-by: Stephen Boyd <sboyd@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/clk/clk.c |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/clk/clk.c
-+++ b/drivers/clk/clk.c
-@@ -2746,6 +2746,9 @@ void clk_unregister(struct clk *clk)
-                                       __func__, clk->core->name);
-       kref_put(&clk->core->ref, __clk_release);
- unlock:
-+      if (ret)
-+              hlist_del_init(&core->child_node);
-+
-       clk_prepare_unlock();
- }
- EXPORT_SYMBOL_GPL(clk_unregister);

diff --git a/queue-4.9/series b/queue-4.9/series
index de95320745078a19b6740c5bb854c1defc586943..2b7e86955a013ec4a9f4305b1135e0b25647b2e4 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -84,7 +84,6 @@ usb-gadget-audio-fix-a-missing-error-return-value-in-audio_bind.patch
 usb-gadget-legacy-fix-error-return-code-in-gncm_bind.patch
 usb-gadget-legacy-fix-error-return-code-in-cdc_bind.patch
 revert-alsa-hda-realtek-fix-pop-noise-on-alc225.patch
-clk-unlink-clock-if-failed-to-prepare-or-enable.patch
 arm-dts-r8a73a4-add-missing-cmt1-interrupts.patch
 arm-dts-r8a7740-add-missing-extal2-to-cpg-node.patch
 kvm-x86-fix-off-by-one-error-in-kvm_vcpu_ioctl_x86_setup_mce.patch