6.0-stable patches

added patches:
	rtc-cmos-fix-build-on-non-acpi-platforms.patch

diff --git a/queue-6.0/rtc-cmos-fix-build-on-non-acpi-platforms.patch b/queue-6.0/rtc-cmos-fix-build-on-non-acpi-platforms.patch
new file mode 100644 (file)
index 0000000..953a6be
--- /dev/null
+++ b/queue-6.0/rtc-cmos-fix-build-on-non-acpi-platforms.patch
@@ -0,0 +1,32 @@
+From db4e955ae333567dea02822624106c0b96a2f84f Mon Sep 17 00:00:00 2001
+From: Alexandre Belloni <alexandre.belloni@bootlin.com>
+Date: Tue, 18 Oct 2022 22:35:11 +0200
+Subject: rtc: cmos: fix build on non-ACPI platforms
+
+From: Alexandre Belloni <alexandre.belloni@bootlin.com>
+
+commit db4e955ae333567dea02822624106c0b96a2f84f upstream.
+
+Now that rtc_wake_setup is called outside of cmos_wake_setup, it also need
+to be defined on non-ACPI platforms.
+
+Reported-by: kernel test robot <lkp@intel.com>
+Link: https://lore.kernel.org/r/20221018203512.2532407-1-alexandre.belloni@bootlin.com
+Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/rtc/rtc-cmos.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/rtc/rtc-cmos.c
++++ b/drivers/rtc/rtc-cmos.c
+@@ -1346,6 +1346,9 @@ static void cmos_check_acpi_rtc_status(s
+ {
+ }
+ 
++static void rtc_wake_setup(struct device *dev)
++{
++}
+ #endif
+ 
+ #ifdef        CONFIG_PNP

diff --git a/queue-6.0/series b/queue-6.0/series
index 4719b70fa663ceb4332a571e6d250e29c5622f2e..3be1b7b2652445479e7ef5323e508334a3fee390 100644 (file)
--- a/queue-6.0/series
+++ b/queue-6.0/series
@@ -2,3 +2,4 @@ rtc-cmos-fix-event-handler-registration-ordering-issue.patch
 rtc-cmos-fix-wake-alarm-breakage.patch
 x86-vdso-conditionally-export-__vdso_sgx_enter_enclave.patch
 libbpf-fix-uninitialized-warning-in-btf_dump_dump_type_data.patch
+rtc-cmos-fix-build-on-non-acpi-platforms.patch