drop rtc-cmos-fix-build-on-non-acpi-platforms.patch from all branches

diff --git a/queue-4.14/rtc-cmos-fix-build-on-non-acpi-platforms.patch b/queue-4.14/rtc-cmos-fix-build-on-non-acpi-platforms.patch
deleted file mode 100644 (file)
index 096fc83..0000000
--- a/queue-4.14/rtc-cmos-fix-build-on-non-acpi-platforms.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From c2a6482928f8f2474e87b09b369a99a2c1447eea Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-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>
-
-[ Upstream commit db4e955ae333567dea02822624106c0b96a2f84f ]
-
-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: Sasha Levin <sashal@kernel.org>
----
- drivers/rtc/rtc-cmos.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
-index 5e2ee430b3f8..655caf2cf1e6 100644
---- a/drivers/rtc/rtc-cmos.c
-+++ b/drivers/rtc/rtc-cmos.c
-@@ -1189,6 +1189,9 @@ static void cmos_check_acpi_rtc_status(struct device *dev,
- {
- }
- 
-+static void rtc_wake_setup(struct device *dev)
-+{
-+}
- #endif
- 
- #ifdef        CONFIG_PNP
--- 
-2.35.1
-

diff --git a/queue-4.14/series b/queue-4.14/series
index f10815c8b48a650f0889759554c763768d169dfc..a972b3600ac9bdeede3a690c511b5991e94b65cf 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -31,7 +31,6 @@ dmaengine-at_hdmac-fix-impossible-condition.patch
 dmaengine-at_hdmac-check-return-code-of-dma_async_device_register.patch
 x86-cpu-restore-amd-s-de_cfg-msr-after-resume.patch
 selftests-futex-fix-build-for-clang.patch
-rtc-cmos-fix-build-on-non-acpi-platforms.patch
 drm-imx-imx-tve-fix-return-type-of-imx_tve_connector.patch
 bluetooth-l2cap-fix-l2cap_global_chan_by_psm.patch
 asoc-core-fix-use-after-free-in-snd_soc_exit.patch

diff --git a/queue-4.19/rtc-cmos-fix-build-on-non-acpi-platforms.patch b/queue-4.19/rtc-cmos-fix-build-on-non-acpi-platforms.patch
deleted file mode 100644 (file)
index 2184468..0000000
--- a/queue-4.19/rtc-cmos-fix-build-on-non-acpi-platforms.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 77860c96093ddc7e271e4e6111a17c6886549adf Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-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>
-
-[ Upstream commit db4e955ae333567dea02822624106c0b96a2f84f ]
-
-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: Sasha Levin <sashal@kernel.org>
----
- drivers/rtc/rtc-cmos.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
-index 8545f0da57fe..c6147d8b622f 100644
---- a/drivers/rtc/rtc-cmos.c
-+++ b/drivers/rtc/rtc-cmos.c
-@@ -1294,6 +1294,9 @@ static void cmos_check_acpi_rtc_status(struct device *dev,
- {
- }
- 
-+static void rtc_wake_setup(struct device *dev)
-+{
-+}
- #endif
- 
- #ifdef        CONFIG_PNP
--- 
-2.35.1
-

diff --git a/queue-4.19/series b/queue-4.19/series
index d90b54a8f35f8cf2759298250b29e56d74ee55ab..4037927fb29286fc3ddf6072faa9e37e2be73e9e 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -46,7 +46,6 @@ asoc-wm8997-revert-asoc-wm8997-fix-pm-disable-depth-.patch
 spi-intel-fix-the-offset-to-get-the-64k-erase-opcode.patch
 selftests-futex-fix-build-for-clang.patch
 selftests-intel_pstate-fix-build-for-arch-x86_64.patch
-rtc-cmos-fix-build-on-non-acpi-platforms.patch
 nfsv4-retry-lock-on-old_stateid-during-delegation-re.patch
 drm-imx-imx-tve-fix-return-type-of-imx_tve_connector.patch
 btrfs-remove-pointless-and-double-ulist-frees-in-err.patch

diff --git a/queue-4.9/rtc-cmos-fix-build-on-non-acpi-platforms.patch b/queue-4.9/rtc-cmos-fix-build-on-non-acpi-platforms.patch
deleted file mode 100644 (file)
index b7a3d73..0000000
--- a/queue-4.9/rtc-cmos-fix-build-on-non-acpi-platforms.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From ba5fc62647ab86e71ef1a796970f8df7a3a04975 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-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>
-
-[ Upstream commit db4e955ae333567dea02822624106c0b96a2f84f ]
-
-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: Sasha Levin <sashal@kernel.org>
----
- drivers/rtc/rtc-cmos.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
-index 1dbd8419df7d..2c3881bdf9bb 100644
---- a/drivers/rtc/rtc-cmos.c
-+++ b/drivers/rtc/rtc-cmos.c
-@@ -1113,6 +1113,9 @@ static void cmos_check_acpi_rtc_status(struct device *dev,
- {
- }
- 
-+static void rtc_wake_setup(struct device *dev)
-+{
-+}
- #endif
- 
- #ifdef        CONFIG_PNP
--- 
-2.35.1
-

diff --git a/queue-4.9/series b/queue-4.9/series
index 3a9d69670cc449bfd9721e4624a71973d0b7df3e..4c22eda7c68771bbe2e5042ab764636f3ce3caea 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -27,7 +27,6 @@ dmaengine-at_hdmac-don-t-allow-cpu-to-reorder-channel-enable.patch
 dmaengine-at_hdmac-fix-impossible-condition.patch
 dmaengine-at_hdmac-check-return-code-of-dma_async_device_register.patch
 x86-cpu-restore-amd-s-de_cfg-msr-after-resume.patch
-rtc-cmos-fix-build-on-non-acpi-platforms.patch
 drm-imx-imx-tve-fix-return-type-of-imx_tve_connector.patch
 bluetooth-l2cap-fix-l2cap_global_chan_by_psm.patch
 asoc-core-fix-use-after-free-in-snd_soc_exit.patch

diff --git a/queue-5.10/rtc-cmos-fix-build-on-non-acpi-platforms.patch b/queue-5.10/rtc-cmos-fix-build-on-non-acpi-platforms.patch
deleted file mode 100644 (file)
index 9452c35..0000000
--- a/queue-5.10/rtc-cmos-fix-build-on-non-acpi-platforms.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 6976726888aa360d038a9f4f1f1a5d63be84cfac Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-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>
-
-[ Upstream commit db4e955ae333567dea02822624106c0b96a2f84f ]
-
-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: Sasha Levin <sashal@kernel.org>
----
- drivers/rtc/rtc-cmos.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
-index 58c6382a2807..0383f49ee0d8 100644
---- a/drivers/rtc/rtc-cmos.c
-+++ b/drivers/rtc/rtc-cmos.c
-@@ -1293,6 +1293,9 @@ static void cmos_check_acpi_rtc_status(struct device *dev,
- {
- }
- 
-+static void rtc_wake_setup(struct device *dev)
-+{
-+}
- #endif
- 
- #ifdef        CONFIG_PNP
--- 
-2.35.1
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 885aa8070dfbcd56477a976512cf577e74d94571..655505dc39620ed6a3aaa4bc83d3e06f44ce9bd6 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -10,7 +10,6 @@ asoc-codecs-jz4725b-use-right-control-for-capture-vo.patch
 asoc-codecs-jz4725b-fix-capture-selector-naming.patch
 selftests-futex-fix-build-for-clang.patch
 selftests-intel_pstate-fix-build-for-arch-x86_64.patch
-rtc-cmos-fix-build-on-non-acpi-platforms.patch
 asoc-rt1308-sdw-add-the-default-value-of-some-regist.patch
 drm-amd-display-remove-wrong-pipe-control-lock.patch
 nfsv4-retry-lock-on-old_stateid-during-delegation-re.patch

diff --git a/queue-5.15/rtc-cmos-fix-build-on-non-acpi-platforms.patch b/queue-5.15/rtc-cmos-fix-build-on-non-acpi-platforms.patch
deleted file mode 100644 (file)
index 4a78c74..0000000
--- a/queue-5.15/rtc-cmos-fix-build-on-non-acpi-platforms.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 863cc7f3ce0d28362c4f545a64ab67cf60d610f8 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-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>
-
-[ Upstream commit db4e955ae333567dea02822624106c0b96a2f84f ]
-
-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: Sasha Levin <sashal@kernel.org>
----
- drivers/rtc/rtc-cmos.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
-index b90a603d6b12..3e7b6834a7b0 100644
---- a/drivers/rtc/rtc-cmos.c
-+++ b/drivers/rtc/rtc-cmos.c
-@@ -1296,6 +1296,9 @@ static void cmos_check_acpi_rtc_status(struct device *dev,
- {
- }
- 
-+static void rtc_wake_setup(struct device *dev)
-+{
-+}
- #endif
- 
- #ifdef        CONFIG_PNP
--- 
-2.35.1
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 318e4fa85dab828a50cc8a8645432764c027de89..9a9203d48b30d8e9637213e41c1e298892ec588d 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -15,7 +15,6 @@ asoc-codecs-jz4725b-fix-capture-selector-naming.patch
 asoc-intel-sof_sdw-add-quirk-variant-for-lapbc710-nu.patch
 selftests-futex-fix-build-for-clang.patch
 selftests-intel_pstate-fix-build-for-arch-x86_64.patch
-rtc-cmos-fix-build-on-non-acpi-platforms.patch
 asoc-rt1308-sdw-add-the-default-value-of-some-regist.patch
 drm-amd-display-remove-wrong-pipe-control-lock.patch
 acpi-scan-add-latt2021-to-acpi_ignore_dep_ids.patch

diff --git a/queue-5.4/rtc-cmos-fix-build-on-non-acpi-platforms.patch b/queue-5.4/rtc-cmos-fix-build-on-non-acpi-platforms.patch
deleted file mode 100644 (file)
index 9947db4..0000000
--- a/queue-5.4/rtc-cmos-fix-build-on-non-acpi-platforms.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 542d4bf0881e7698381f1901e1917719c39d7e70 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-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>
-
-[ Upstream commit db4e955ae333567dea02822624106c0b96a2f84f ]
-
-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: Sasha Levin <sashal@kernel.org>
----
- drivers/rtc/rtc-cmos.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
-index c0dc03ffa817..be92919af2f3 100644
---- a/drivers/rtc/rtc-cmos.c
-+++ b/drivers/rtc/rtc-cmos.c
-@@ -1290,6 +1290,9 @@ static void cmos_check_acpi_rtc_status(struct device *dev,
- {
- }
- 
-+static void rtc_wake_setup(struct device *dev)
-+{
-+}
- #endif
- 
- #ifdef        CONFIG_PNP
--- 
-2.35.1
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 6b1ada292c70680a978d0a146d093ec754e16ae0..f291af1d2f8f0c30e8d9f1983ae497b488a75f83 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -72,7 +72,6 @@ asoc-codecs-jz4725b-use-right-control-for-capture-vo.patch
 asoc-codecs-jz4725b-fix-capture-selector-naming.patch
 selftests-futex-fix-build-for-clang.patch
 selftests-intel_pstate-fix-build-for-arch-x86_64.patch
-rtc-cmos-fix-build-on-non-acpi-platforms.patch
 nfsv4-retry-lock-on-old_stateid-during-delegation-re.patch
 i2c-i801-add-lis3lv02d-s-i2c-address-for-vostro-5568.patch
 drm-imx-imx-tve-fix-return-type-of-imx_tve_connector.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
deleted file mode 100644 (file)
index 2067d08..0000000
--- a/queue-6.0/rtc-cmos-fix-build-on-non-acpi-platforms.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 09dddf260525c390234c6ec2a3452b841ac5248b Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-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>
-
-[ Upstream commit db4e955ae333567dea02822624106c0b96a2f84f ]
-
-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: Sasha Levin <sashal@kernel.org>
----
- drivers/rtc/rtc-cmos.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
-index bdb1df843c78..31aa11e0e7d4 100644
---- a/drivers/rtc/rtc-cmos.c
-+++ b/drivers/rtc/rtc-cmos.c
-@@ -1344,6 +1344,9 @@ static void cmos_check_acpi_rtc_status(struct device *dev,
- {
- }
- 
-+static void rtc_wake_setup(struct device *dev)
-+{
-+}
- #endif
- 
- #ifdef        CONFIG_PNP
--- 
-2.35.1
-

diff --git a/queue-6.0/series b/queue-6.0/series
index 0458175cf96f46e5bd7488a7ebfe23695eb742c7..c71c55025d6c8a35e8b3d98478257c3c87e9d96f 100644 (file)
--- a/queue-6.0/series
+++ b/queue-6.0/series
@@ -18,7 +18,6 @@ selftests-futex-fix-build-for-clang.patch
 selftests-intel_pstate-fix-build-for-arch-x86_64.patch
 selftests-kexec-fix-build-for-arch-x86_64.patch
 asoc-intel-sof_rt5682-add-quirk-for-rex-board.patch
-rtc-cmos-fix-build-on-non-acpi-platforms.patch
 asoc-rt1308-sdw-add-the-default-value-of-some-regist.patch
 asoc-amd-yc-adding-lenovo-thinkbook-14-gen-4-ara-and.patch
 asoc-amd-yc-add-lenovo-thinkbook-14-2022-21d0-to-qui.patch