6.6-stable patches

added patches:
	serial-core-fix-kernel-doc-for-uart_port_unlock_irqrestore.patch
	thermal-trip-drop-lockdep-assertion-from-thermal_zone_trip_id.patch

diff --git a/queue-6.6/serial-core-fix-kernel-doc-for-uart_port_unlock_irqrestore.patch b/queue-6.6/serial-core-fix-kernel-doc-for-uart_port_unlock_irqrestore.patch
new file mode 100644 (file)
index 0000000..41e24a5
--- /dev/null
+++ b/queue-6.6/serial-core-fix-kernel-doc-for-uart_port_unlock_irqrestore.patch
@@ -0,0 +1,38 @@
+From 29bff582b74ed0bdb7e6986482ad9e6799ea4d2f Mon Sep 17 00:00:00 2001
+From: Randy Dunlap <rdunlap@infradead.org>
+Date: Tue, 26 Sep 2023 21:41:28 -0700
+Subject: serial: core: fix kernel-doc for uart_port_unlock_irqrestore()
+
+From: Randy Dunlap <rdunlap@infradead.org>
+
+commit 29bff582b74ed0bdb7e6986482ad9e6799ea4d2f upstream.
+
+Fix the function name to avoid a kernel-doc warning:
+
+include/linux/serial_core.h:666: warning: expecting prototype for uart_port_lock_irqrestore(). Prototype was for uart_port_unlock_irqrestore() instead
+
+Fixes: b0af4bcb4946 ("serial: core: Provide port lock wrappers")
+Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: John Ogness <john.ogness@linutronix.de>
+Cc: linux-serial@vger.kernel.org
+Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Cc: Jiri Slaby <jirislaby@kernel.org>
+Reviewed-by: John Ogness <john.ogness@linutronix.de>
+Link: https://lore.kernel.org/r/20230927044128.4748-1-rdunlap@infradead.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ include/linux/serial_core.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/include/linux/serial_core.h
++++ b/include/linux/serial_core.h
+@@ -658,7 +658,7 @@ static inline void uart_port_unlock_irq(
+ }
+ 
+ /**
+- * uart_port_lock_irqrestore - Unlock the UART port, restore interrupts
++ * uart_port_unlock_irqrestore - Unlock the UART port, restore interrupts
+  * @up:               Pointer to UART port structure
+  * @flags:    The saved interrupt flags for restore
+  */

diff --git a/queue-6.6/series b/queue-6.6/series
index 2de2ddd23aeaa1288cbc5b1bb0b963ce8cafd69c..fe6dd08be32de50051aa8b33392311f556887c8b 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -327,3 +327,5 @@ genirq-initialize-resend_node-hlist-for-all-interrupt-descriptors.patch
 clocksource-skip-watchdog-check-for-large-watchdog-intervals.patch
 tick-sched-preserve-number-of-idle-sleeps-across-cpu-hotplug-events.patch
 x86-entry-ia32-ensure-s32-is-sign-extended-to-s64.patch
+serial-core-fix-kernel-doc-for-uart_port_unlock_irqrestore.patch
+thermal-trip-drop-lockdep-assertion-from-thermal_zone_trip_id.patch

diff --git a/queue-6.6/thermal-trip-drop-lockdep-assertion-from-thermal_zone_trip_id.patch b/queue-6.6/thermal-trip-drop-lockdep-assertion-from-thermal_zone_trip_id.patch
new file mode 100644 (file)
index 0000000..8f7c4c0
--- /dev/null
+++ b/queue-6.6/thermal-trip-drop-lockdep-assertion-from-thermal_zone_trip_id.patch
@@ -0,0 +1,41 @@
+From 108ffd12be24ba1d74b3314df8db32a0a6d55ba5 Mon Sep 17 00:00:00 2001
+From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
+Date: Wed, 11 Oct 2023 17:45:42 +0200
+Subject: thermal: trip: Drop lockdep assertion from thermal_zone_trip_id()
+
+From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+
+commit 108ffd12be24ba1d74b3314df8db32a0a6d55ba5 upstream.
+
+The lockdep assertion in thermal_zone_trip_id() triggers when the
+trip point sysfs attribute of a thermal instance is read, because
+there is no thermal zone locking in that code path.
+
+This is not verly useful, though, because there is no mechanism by which
+the location of the trips[] table in a thermal zone or its size can
+change after binding cooling devices to the trips in that thermal
+zone and before those cooling devices are unbound from them.  Thus
+it is not in fact necessary to hold the thermal zone lock when
+thermal_zone_trip_id() is called from trip_point_show() and so the
+lockdep asserion in the former is invalid.
+
+Accordingly, drop that lockdep assertion.
+
+Fixes: 2c7b4bfadef0 ("thermal: core: Store trip pointer in struct thermal_instance")
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/thermal/thermal_trip.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/drivers/thermal/thermal_trip.c
++++ b/drivers/thermal/thermal_trip.c
+@@ -178,8 +178,6 @@ int thermal_zone_trip_id(struct thermal_
+ {
+       int i;
+ 
+-      lockdep_assert_held(&tz->lock);
+-
+       for (i = 0; i < tz->num_trips; i++) {
+               if (&tz->trips[i] == trip)
+                       return i;