6.1-stable patches

added patches:
	firmware-arm_scmi-fix-unused-notifier-block-in-unregister.patch

diff --git a/queue-6.1/firmware-arm_scmi-fix-unused-notifier-block-in-unregister.patch b/queue-6.1/firmware-arm_scmi-fix-unused-notifier-block-in-unregister.patch
new file mode 100644 (file)
index 0000000..0c1e4f2
--- /dev/null
+++ b/queue-6.1/firmware-arm_scmi-fix-unused-notifier-block-in-unregister.patch
@@ -0,0 +1,42 @@
+From amitaig@hailo.ai  Fri Jan  9 11:44:57 2026
+From: Amitai Gottlieb <amitaig@hailo.ai>
+Date: Tue, 16 Dec 2025 13:50:09 +0200
+Subject: firmware: arm_scmi: Fix unused notifier-block in unregister
+To: stable@vger.kernel.org
+Cc: gregkh@linuxfoundation.org, sudeep.holla@arm.com, amitaigottlieb@gmail.com, Amitai Gottlieb <amitaig@hailo.ai>, Dan Carpenter <dan.carpenter@linaro.org>, Cristian Marussi <cristian.marussi@arm.com>
+Message-ID: <20251216115009.30573-1-amitaig@hailo.ai>
+
+From: Amitai Gottlieb <amitaig@hailo.ai>
+
+In scmi_devm_notifier_unregister(), the notifier-block argument was ignored
+and never passed to devres_release(). As a result, the function always
+returned -ENOENT and failed to unregister the notifier.
+
+Drivers that depend on this helper for teardown could therefore hit
+unexpected failures, including kernel panics.
+
+Commit 264a2c520628 ("firmware: arm_scmi: Simplify scmi_devm_notifier_unregister")
+removed the faulty code path during refactoring and hence this fix is not
+required upstream.
+
+Cc: <stable@vger.kernel.org> # 5.15.x, 6.1.x, and 6.6.x
+Fixes: 5ad3d1cf7d34 ("firmware: arm_scmi: Introduce new devres notification ops")
+Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org>
+Reviewed-by: Cristian Marussi <cristian.marussi@arm.com>
+Signed-off-by: Amitai Gottlieb <amitaig@hailo.ai>
+Reviewed-by: Sudeep Holla <sudeep.holla@arm.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/firmware/arm_scmi/notify.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/firmware/arm_scmi/notify.c
++++ b/drivers/firmware/arm_scmi/notify.c
+@@ -1539,6 +1539,7 @@ static int scmi_devm_notifier_unregister
+       dres.handle = sdev->handle;
+       dres.proto_id = proto_id;
+       dres.evt_id = evt_id;
++      dres.nb = nb;
+       if (src_id) {
+               dres.__src_id = *src_id;
+               dres.src_id = &dres.__src_id;

diff --git a/queue-6.1/series b/queue-6.1/series
index fe8be6689ae961b41fff0b7ad7b63be922d40972..9355610d588939a1e5d9496651712dbeb1b1d42e 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -621,3 +621,4 @@ ext4-fix-error-message-when-rejecting-the-default-hash.patch
 pwm-stm32-always-program-polarity.patch
 blk-mq-setup-queue-tag_set-before-initializing-hctx.patch
 tty-fix-tty_port_tty_-hangup-kernel-doc.patch
+firmware-arm_scmi-fix-unused-notifier-block-in-unregister.patch