drop broken atmel patches from 5.4, 5.10, and 5.15

diff --git a/queue-5.10/series b/queue-5.10/series
index 6e8cec81bbfcab670eeb54ae76bc242689b1df22..b5164f7de192ae7e92adbbde406233d5eab2a66d 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -63,7 +63,6 @@ bpf-send-signals-asynchronously-if-preemptible.patch
 padata-fix-uaf-in-padata_reorder.patch
 padata-add-pd-get-put-refcnt-helper.patch
 padata-avoid-uaf-for-reorder_work.patch
-soc-atmel-fix-device_node-release-in-atmel_soc_devic.patch
 arm64-dts-mediatek-mt8516-fix-gicv2-range.patch
 arm64-dts-mediatek-mt8516-fix-wdt-irq-type.patch
 arm64-dts-mediatek-mt8516-remove-2-invalid-i2c-clock.patch

diff --git a/queue-5.10/soc-atmel-fix-device_node-release-in-atmel_soc_devic.patch b/queue-5.10/soc-atmel-fix-device_node-release-in-atmel_soc_devic.patch
deleted file mode 100644 (file)
index 2f67468..0000000
--- a/queue-5.10/soc-atmel-fix-device_node-release-in-atmel_soc_devic.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From a93bf0191848b931143f60e57abfc7d76b5e3e22 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 31 Oct 2024 13:33:36 +0100
-Subject: soc: atmel: fix device_node release in atmel_soc_device_init()
-
-From: Javier Carrasco <javier.carrasco.cruz@gmail.com>
-
-[ Upstream commit d3455ab798100f40af77123e7c2443ec979c546b ]
-
-A device_node acquired via of_find_node_by_path() requires explicit
-calls to of_node_put() when it is no longer needed to avoid leaking the
-resource.
-
-Instead of adding the missing calls to of_node_put() in all execution
-paths, use the cleanup attribute for 'np' by means of the __free()
-macro, which automatically calls of_node_put() when the variable goes
-out of scope.
-
-Fixes: 960ddf70cc11 ("drivers: soc: atmel: Avoid calling at91_soc_init on non AT91 SoCs")
-Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com>
-Link: https://lore.kernel.org/r/20241031-soc-atmel-soc-cleanup-v2-1-73f2d235fd98@gmail.com
-Signed-off-by: Claudiu Beznea <claudiu.beznea@tuxon.dev>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/soc/atmel/soc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/soc/atmel/soc.c b/drivers/soc/atmel/soc.c
-index 5d06ee70a36b9..7d852f859687b 100644
---- a/drivers/soc/atmel/soc.c
-+++ b/drivers/soc/atmel/soc.c
-@@ -275,7 +275,7 @@ static const struct of_device_id at91_soc_allowed_list[] __initconst = {
- 
- static int __init atmel_soc_device_init(void)
- {
--      struct device_node *np = of_find_node_by_path("/");
-+      struct device_node *np __free(device_node) = of_find_node_by_path("/");
- 
-       if (!of_match_node(at91_soc_allowed_list, np))
-               return 0;
--- 
-2.39.5
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 9047a7e0d39f069ad773fa37e34260dc77f15282..956bae0f206f331bb6ca1c567bf43a6af5c0e896 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -102,7 +102,6 @@ bpf-send-signals-asynchronously-if-preemptible.patch
 padata-fix-uaf-in-padata_reorder.patch
 padata-add-pd-get-put-refcnt-helper.patch
 padata-avoid-uaf-for-reorder_work.patch
-soc-atmel-fix-device_node-release-in-atmel_soc_devic.patch
 arm-at91-pm-change-bu-power-switch-to-automatic-mode.patch
 arm64-dts-mt8183-set-dmic-one-wire-mode-on-damu.patch
 arm64-dts-mediatek-mt8516-fix-gicv2-range.patch

diff --git a/queue-5.15/soc-atmel-fix-device_node-release-in-atmel_soc_devic.patch b/queue-5.15/soc-atmel-fix-device_node-release-in-atmel_soc_devic.patch
deleted file mode 100644 (file)
index ce01b6c..0000000
--- a/queue-5.15/soc-atmel-fix-device_node-release-in-atmel_soc_devic.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From bbc05a60f5781ebf28b3e5a4d3de62f2fdbe2a94 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 31 Oct 2024 13:33:36 +0100
-Subject: soc: atmel: fix device_node release in atmel_soc_device_init()
-
-From: Javier Carrasco <javier.carrasco.cruz@gmail.com>
-
-[ Upstream commit d3455ab798100f40af77123e7c2443ec979c546b ]
-
-A device_node acquired via of_find_node_by_path() requires explicit
-calls to of_node_put() when it is no longer needed to avoid leaking the
-resource.
-
-Instead of adding the missing calls to of_node_put() in all execution
-paths, use the cleanup attribute for 'np' by means of the __free()
-macro, which automatically calls of_node_put() when the variable goes
-out of scope.
-
-Fixes: 960ddf70cc11 ("drivers: soc: atmel: Avoid calling at91_soc_init on non AT91 SoCs")
-Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com>
-Link: https://lore.kernel.org/r/20241031-soc-atmel-soc-cleanup-v2-1-73f2d235fd98@gmail.com
-Signed-off-by: Claudiu Beznea <claudiu.beznea@tuxon.dev>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/soc/atmel/soc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/soc/atmel/soc.c b/drivers/soc/atmel/soc.c
-index 9e3d370114474..31fae363a589b 100644
---- a/drivers/soc/atmel/soc.c
-+++ b/drivers/soc/atmel/soc.c
-@@ -364,7 +364,7 @@ static const struct of_device_id at91_soc_allowed_list[] __initconst = {
- 
- static int __init atmel_soc_device_init(void)
- {
--      struct device_node *np = of_find_node_by_path("/");
-+      struct device_node *np __free(device_node) = of_find_node_by_path("/");
- 
-       if (!of_match_node(at91_soc_allowed_list, np))
-               return 0;
--- 
-2.39.5
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 199efd02bf4db0a1d9462196c2a433ac2b432ed2..d3446a07aaee56c33acb987cae98e2f70639d265 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -36,7 +36,6 @@ perf-machine-include-data-symbols-in-the-kernel-map.patch
 perf-machine-don-t-ignore-_etext-when-not-a-text-sym.patch
 perf-report-fix-misleading-help-message-about-demang.patch
 bpf-send-signals-asynchronously-if-preemptible.patch
-soc-atmel-fix-device_node-release-in-atmel_soc_devic.patch
 rdma-mlx4-avoid-false-error-about-access-to-uninitia.patch
 rdma-cxgb4-prevent-potential-integer-overflow-on-32b.patch
 arm64-dts-mediatek-mt8173-evb-drop-regulator-compati.patch

diff --git a/queue-5.4/soc-atmel-fix-device_node-release-in-atmel_soc_devic.patch b/queue-5.4/soc-atmel-fix-device_node-release-in-atmel_soc_devic.patch
deleted file mode 100644 (file)
index d92d246..0000000
--- a/queue-5.4/soc-atmel-fix-device_node-release-in-atmel_soc_devic.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From f7738b4dba8712d5b3cc7e04b0ae81fd973837c6 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 31 Oct 2024 13:33:36 +0100
-Subject: soc: atmel: fix device_node release in atmel_soc_device_init()
-
-From: Javier Carrasco <javier.carrasco.cruz@gmail.com>
-
-[ Upstream commit d3455ab798100f40af77123e7c2443ec979c546b ]
-
-A device_node acquired via of_find_node_by_path() requires explicit
-calls to of_node_put() when it is no longer needed to avoid leaking the
-resource.
-
-Instead of adding the missing calls to of_node_put() in all execution
-paths, use the cleanup attribute for 'np' by means of the __free()
-macro, which automatically calls of_node_put() when the variable goes
-out of scope.
-
-Fixes: 960ddf70cc11 ("drivers: soc: atmel: Avoid calling at91_soc_init on non AT91 SoCs")
-Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com>
-Link: https://lore.kernel.org/r/20241031-soc-atmel-soc-cleanup-v2-1-73f2d235fd98@gmail.com
-Signed-off-by: Claudiu Beznea <claudiu.beznea@tuxon.dev>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/soc/atmel/soc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/soc/atmel/soc.c b/drivers/soc/atmel/soc.c
-index 4b4174597150d..eed42bc9ea89d 100644
---- a/drivers/soc/atmel/soc.c
-+++ b/drivers/soc/atmel/soc.c
-@@ -274,7 +274,7 @@ static const struct of_device_id at91_soc_allowed_list[] __initconst = {
- 
- static int __init atmel_soc_device_init(void)
- {
--      struct device_node *np = of_find_node_by_path("/");
-+      struct device_node *np __free(device_node) = of_find_node_by_path("/");
- 
-       if (!of_match_node(at91_soc_allowed_list, np))
-               return 0;
--- 
-2.39.5
-