Drop isdn-don-t-mark-kcapi_proc_exit-as-__exit.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.14/isdn-don-t-mark-kcapi_proc_exit-as-__exit.patch b/queue-4.14/isdn-don-t-mark-kcapi_proc_exit-as-__exit.patch
deleted file mode 100644 (file)
index 048efd3..0000000
--- a/queue-4.14/isdn-don-t-mark-kcapi_proc_exit-as-__exit.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 04540637574e142875cee91146cdd9324b381819 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 16 Dec 2019 20:48:56 +0100
-Subject: isdn: don't mark kcapi_proc_exit as __exit
-
-From: Arnd Bergmann <arnd@arndb.de>
-
-[ Upstream commit b33bdf8020c94438269becc6dace9ed49257c4ba ]
-
-As everybody pointed out by now, my patch to clean up CAPI introduced
-a link time warning, as the two parts of the capi driver are now in
-one module and the exit function may need to be called in the error
-path of the init function:
-
->> WARNING: drivers/isdn/capi/kernelcapi.o(.text+0xea4): Section mismatch in reference from the function kcapi_exit() to the function .exit.text:kcapi_proc_exit()
-   The function kcapi_exit() references a function in an exit section.
-   Often the function kcapi_proc_exit() has valid usage outside the exit section
-   and the fix is to remove the __exit annotation of kcapi_proc_exit.
-
-Remove the incorrect __exit annotation.
-
-Reported-by: kbuild test robot <lkp@intel.com>
-Reported-by: kernelci.org bot <bot@kernelci.org>
-Reported-by: Olof's autobuilder <build@lixom.net>
-Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Link: https://lore.kernel.org/r/20191216194909.1983639-1-arnd@arndb.de
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/isdn/capi/kcapi_proc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/isdn/capi/kcapi_proc.c b/drivers/isdn/capi/kcapi_proc.c
-index 68db3c5a10636..d6ca626219c93 100644
---- a/drivers/isdn/capi/kcapi_proc.c
-+++ b/drivers/isdn/capi/kcapi_proc.c
-@@ -309,7 +309,7 @@ kcapi_proc_init(void)
-       proc_create("capi/driver",       0, NULL, &proc_driver_ops);
- }
- 
--void __exit
-+void
- kcapi_proc_exit(void)
- {
-       remove_proc_entry("capi/driver",       NULL);
--- 
-2.20.1
-

diff --git a/queue-4.14/series b/queue-4.14/series
index 1373ad8c0503c676a5a41efce918baa00fddee4a..6d18cbf009d066466a0326c8025782820367b223 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -75,7 +75,6 @@ arm-dts-imx6-rdu2-disable-wp-for-usdhc2-and-usdhc3.patch
 media-v4l2-device.h-explicitly-compare-grp-id-mask-t.patch
 reiserfs-fix-spurious-unlock-in-reiserfs_fill_super-.patch
 fore200e-fix-incorrect-checks-of-null-pointer-derefe.patch
-isdn-don-t-mark-kcapi_proc_exit-as-__exit.patch
 alsa-usx2y-adjust-indentation-in-snd_usx2y_hwdep_dsp.patch
 b43legacy-fix-wcast-function-type.patch
 ipw2x00-fix-wcast-function-type.patch

diff --git a/queue-4.19/isdn-don-t-mark-kcapi_proc_exit-as-__exit.patch b/queue-4.19/isdn-don-t-mark-kcapi_proc_exit-as-__exit.patch
deleted file mode 100644 (file)
index ea3756f..0000000
--- a/queue-4.19/isdn-don-t-mark-kcapi_proc_exit-as-__exit.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 079b1293bd835f559327d281cfb895ebd6c12c10 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 16 Dec 2019 20:48:56 +0100
-Subject: isdn: don't mark kcapi_proc_exit as __exit
-
-From: Arnd Bergmann <arnd@arndb.de>
-
-[ Upstream commit b33bdf8020c94438269becc6dace9ed49257c4ba ]
-
-As everybody pointed out by now, my patch to clean up CAPI introduced
-a link time warning, as the two parts of the capi driver are now in
-one module and the exit function may need to be called in the error
-path of the init function:
-
->> WARNING: drivers/isdn/capi/kernelcapi.o(.text+0xea4): Section mismatch in reference from the function kcapi_exit() to the function .exit.text:kcapi_proc_exit()
-   The function kcapi_exit() references a function in an exit section.
-   Often the function kcapi_proc_exit() has valid usage outside the exit section
-   and the fix is to remove the __exit annotation of kcapi_proc_exit.
-
-Remove the incorrect __exit annotation.
-
-Reported-by: kbuild test robot <lkp@intel.com>
-Reported-by: kernelci.org bot <bot@kernelci.org>
-Reported-by: Olof's autobuilder <build@lixom.net>
-Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Link: https://lore.kernel.org/r/20191216194909.1983639-1-arnd@arndb.de
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/isdn/capi/kcapi_proc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/isdn/capi/kcapi_proc.c b/drivers/isdn/capi/kcapi_proc.c
-index c94bd12c0f7c6..28cd051f1dfd9 100644
---- a/drivers/isdn/capi/kcapi_proc.c
-+++ b/drivers/isdn/capi/kcapi_proc.c
-@@ -239,7 +239,7 @@ kcapi_proc_init(void)
-       proc_create_seq("capi/driver",       0, NULL, &seq_capi_driver_ops);
- }
- 
--void __exit
-+void
- kcapi_proc_exit(void)
- {
-       remove_proc_entry("capi/driver",       NULL);
--- 
-2.20.1
-

diff --git a/queue-4.19/series b/queue-4.19/series
index e5183e88ef4e4ffdba88aae96cedaf97516f5e02..fee2774f425115b35547efa538969eca1e7fe9ab 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -68,7 +68,6 @@ media-v4l2-device.h-explicitly-compare-grp-id-mask-t.patch
 reiserfs-fix-spurious-unlock-in-reiserfs_fill_super-.patch
 r8169-check-that-realtek-phy-driver-module-is-loaded.patch
 fore200e-fix-incorrect-checks-of-null-pointer-derefe.patch
-isdn-don-t-mark-kcapi_proc_exit-as-__exit.patch
 netfilter-nft_tunnel-add-the-missing-erspan_version-.patch
 alsa-usx2y-adjust-indentation-in-snd_usx2y_hwdep_dsp.patch
 b43legacy-fix-wcast-function-type.patch

diff --git a/queue-4.4/isdn-don-t-mark-kcapi_proc_exit-as-__exit.patch b/queue-4.4/isdn-don-t-mark-kcapi_proc_exit-as-__exit.patch
deleted file mode 100644 (file)
index 4a02e51..0000000
--- a/queue-4.4/isdn-don-t-mark-kcapi_proc_exit-as-__exit.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From f4385dedc633e253c0ad64d5dc82c00f1bcf9a67 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 16 Dec 2019 20:48:56 +0100
-Subject: isdn: don't mark kcapi_proc_exit as __exit
-
-From: Arnd Bergmann <arnd@arndb.de>
-
-[ Upstream commit b33bdf8020c94438269becc6dace9ed49257c4ba ]
-
-As everybody pointed out by now, my patch to clean up CAPI introduced
-a link time warning, as the two parts of the capi driver are now in
-one module and the exit function may need to be called in the error
-path of the init function:
-
->> WARNING: drivers/isdn/capi/kernelcapi.o(.text+0xea4): Section mismatch in reference from the function kcapi_exit() to the function .exit.text:kcapi_proc_exit()
-   The function kcapi_exit() references a function in an exit section.
-   Often the function kcapi_proc_exit() has valid usage outside the exit section
-   and the fix is to remove the __exit annotation of kcapi_proc_exit.
-
-Remove the incorrect __exit annotation.
-
-Reported-by: kbuild test robot <lkp@intel.com>
-Reported-by: kernelci.org bot <bot@kernelci.org>
-Reported-by: Olof's autobuilder <build@lixom.net>
-Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Link: https://lore.kernel.org/r/20191216194909.1983639-1-arnd@arndb.de
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/isdn/capi/kcapi_proc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/isdn/capi/kcapi_proc.c b/drivers/isdn/capi/kcapi_proc.c
-index 68db3c5a10636..d6ca626219c93 100644
---- a/drivers/isdn/capi/kcapi_proc.c
-+++ b/drivers/isdn/capi/kcapi_proc.c
-@@ -309,7 +309,7 @@ kcapi_proc_init(void)
-       proc_create("capi/driver",       0, NULL, &proc_driver_ops);
- }
- 
--void __exit
-+void
- kcapi_proc_exit(void)
- {
-       remove_proc_entry("capi/driver",       NULL);
--- 
-2.20.1
-

diff --git a/queue-4.4/series b/queue-4.4/series
index b674b11243447de09f20742820e023de5923160a..f167fd8ac3adafbf9a53994b0487885c4edaa45a 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -33,7 +33,6 @@ regulator-rk808-lower-log-level-on-optional-gpios-be.patch
 nfc-port100-convert-cpu_to_le16-le16_to_cpu-e1-e2-to.patch
 padata-always-acquire-cpu_hotplug_lock-before-pinst-.patch
 reiserfs-fix-spurious-unlock-in-reiserfs_fill_super-.patch
-isdn-don-t-mark-kcapi_proc_exit-as-__exit.patch
 alsa-usx2y-adjust-indentation-in-snd_usx2y_hwdep_dsp.patch
 b43legacy-fix-wcast-function-type.patch
 ipw2x00-fix-wcast-function-type.patch

diff --git a/queue-4.9/isdn-don-t-mark-kcapi_proc_exit-as-__exit.patch b/queue-4.9/isdn-don-t-mark-kcapi_proc_exit-as-__exit.patch
deleted file mode 100644 (file)
index dfc1535..0000000
--- a/queue-4.9/isdn-don-t-mark-kcapi_proc_exit-as-__exit.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From bfb5e9af517f5fed2bdceaff29f559c2e5566c4f Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 16 Dec 2019 20:48:56 +0100
-Subject: isdn: don't mark kcapi_proc_exit as __exit
-
-From: Arnd Bergmann <arnd@arndb.de>
-
-[ Upstream commit b33bdf8020c94438269becc6dace9ed49257c4ba ]
-
-As everybody pointed out by now, my patch to clean up CAPI introduced
-a link time warning, as the two parts of the capi driver are now in
-one module and the exit function may need to be called in the error
-path of the init function:
-
->> WARNING: drivers/isdn/capi/kernelcapi.o(.text+0xea4): Section mismatch in reference from the function kcapi_exit() to the function .exit.text:kcapi_proc_exit()
-   The function kcapi_exit() references a function in an exit section.
-   Often the function kcapi_proc_exit() has valid usage outside the exit section
-   and the fix is to remove the __exit annotation of kcapi_proc_exit.
-
-Remove the incorrect __exit annotation.
-
-Reported-by: kbuild test robot <lkp@intel.com>
-Reported-by: kernelci.org bot <bot@kernelci.org>
-Reported-by: Olof's autobuilder <build@lixom.net>
-Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Link: https://lore.kernel.org/r/20191216194909.1983639-1-arnd@arndb.de
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/isdn/capi/kcapi_proc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/isdn/capi/kcapi_proc.c b/drivers/isdn/capi/kcapi_proc.c
-index 68db3c5a10636..d6ca626219c93 100644
---- a/drivers/isdn/capi/kcapi_proc.c
-+++ b/drivers/isdn/capi/kcapi_proc.c
-@@ -309,7 +309,7 @@ kcapi_proc_init(void)
-       proc_create("capi/driver",       0, NULL, &proc_driver_ops);
- }
- 
--void __exit
-+void
- kcapi_proc_exit(void)
- {
-       remove_proc_entry("capi/driver",       NULL);
--- 
-2.20.1
-

diff --git a/queue-4.9/series b/queue-4.9/series
index 381fc834cc6438fee0c0abdf3233e3bc7149452b..90027e8d4628dd7c28151c1319035afee45fb9aa 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -47,7 +47,6 @@ arm-dts-allwinner-h3-add-pmu-node.patch
 padata-always-acquire-cpu_hotplug_lock-before-pinst-.patch
 media-v4l2-device.h-explicitly-compare-grp-id-mask-t.patch
 reiserfs-fix-spurious-unlock-in-reiserfs_fill_super-.patch
-isdn-don-t-mark-kcapi_proc_exit-as-__exit.patch
 alsa-usx2y-adjust-indentation-in-snd_usx2y_hwdep_dsp.patch
 b43legacy-fix-wcast-function-type.patch
 ipw2x00-fix-wcast-function-type.patch

diff --git a/queue-5.4/isdn-don-t-mark-kcapi_proc_exit-as-__exit.patch b/queue-5.4/isdn-don-t-mark-kcapi_proc_exit-as-__exit.patch
deleted file mode 100644 (file)
index d704b84..0000000
--- a/queue-5.4/isdn-don-t-mark-kcapi_proc_exit-as-__exit.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From c91684e41d303a1c7de35f2b4881eb9be6e7d34d Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 16 Dec 2019 20:48:56 +0100
-Subject: isdn: don't mark kcapi_proc_exit as __exit
-
-From: Arnd Bergmann <arnd@arndb.de>
-
-[ Upstream commit b33bdf8020c94438269becc6dace9ed49257c4ba ]
-
-As everybody pointed out by now, my patch to clean up CAPI introduced
-a link time warning, as the two parts of the capi driver are now in
-one module and the exit function may need to be called in the error
-path of the init function:
-
->> WARNING: drivers/isdn/capi/kernelcapi.o(.text+0xea4): Section mismatch in reference from the function kcapi_exit() to the function .exit.text:kcapi_proc_exit()
-   The function kcapi_exit() references a function in an exit section.
-   Often the function kcapi_proc_exit() has valid usage outside the exit section
-   and the fix is to remove the __exit annotation of kcapi_proc_exit.
-
-Remove the incorrect __exit annotation.
-
-Reported-by: kbuild test robot <lkp@intel.com>
-Reported-by: kernelci.org bot <bot@kernelci.org>
-Reported-by: Olof's autobuilder <build@lixom.net>
-Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Link: https://lore.kernel.org/r/20191216194909.1983639-1-arnd@arndb.de
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/isdn/capi/kcapi_proc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/isdn/capi/kcapi_proc.c b/drivers/isdn/capi/kcapi_proc.c
-index c94bd12c0f7c6..28cd051f1dfd9 100644
---- a/drivers/isdn/capi/kcapi_proc.c
-+++ b/drivers/isdn/capi/kcapi_proc.c
-@@ -239,7 +239,7 @@ kcapi_proc_init(void)
-       proc_create_seq("capi/driver",       0, NULL, &seq_capi_driver_ops);
- }
- 
--void __exit
-+void
- kcapi_proc_exit(void)
- {
-       remove_proc_entry("capi/driver",       NULL);
--- 
-2.20.1
-

diff --git a/queue-5.4/series b/queue-5.4/series
index b7ba9a6e744287e1149801fe9919526810b4af56..b70fd60ed3d6ea736ef0ac82654a1a029fc8a481 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -127,7 +127,6 @@ reiserfs-fix-spurious-unlock-in-reiserfs_fill_super-.patch
 samples-bpf-set-fno-stack-protector-when-building-bp.patch
 r8169-check-that-realtek-phy-driver-module-is-loaded.patch
 fore200e-fix-incorrect-checks-of-null-pointer-derefe.patch
-isdn-don-t-mark-kcapi_proc_exit-as-__exit.patch
 arm-omap2-pdata-quirks-add-prm-data-for-reset-suppor.patch
 netfilter-nft_tunnel-add-the-missing-erspan_version-.patch
 alsa-usx2y-adjust-indentation-in-snd_usx2y_hwdep_dsp.patch

diff --git a/queue-5.5/isdn-don-t-mark-kcapi_proc_exit-as-__exit.patch b/queue-5.5/isdn-don-t-mark-kcapi_proc_exit-as-__exit.patch
deleted file mode 100644 (file)
index 1ffea79..0000000
--- a/queue-5.5/isdn-don-t-mark-kcapi_proc_exit-as-__exit.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From ad116418b2992100adcdad26a97319f28ca6c8cb Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 16 Dec 2019 20:48:56 +0100
-Subject: isdn: don't mark kcapi_proc_exit as __exit
-
-From: Arnd Bergmann <arnd@arndb.de>
-
-[ Upstream commit b33bdf8020c94438269becc6dace9ed49257c4ba ]
-
-As everybody pointed out by now, my patch to clean up CAPI introduced
-a link time warning, as the two parts of the capi driver are now in
-one module and the exit function may need to be called in the error
-path of the init function:
-
->> WARNING: drivers/isdn/capi/kernelcapi.o(.text+0xea4): Section mismatch in reference from the function kcapi_exit() to the function .exit.text:kcapi_proc_exit()
-   The function kcapi_exit() references a function in an exit section.
-   Often the function kcapi_proc_exit() has valid usage outside the exit section
-   and the fix is to remove the __exit annotation of kcapi_proc_exit.
-
-Remove the incorrect __exit annotation.
-
-Reported-by: kbuild test robot <lkp@intel.com>
-Reported-by: kernelci.org bot <bot@kernelci.org>
-Reported-by: Olof's autobuilder <build@lixom.net>
-Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Link: https://lore.kernel.org/r/20191216194909.1983639-1-arnd@arndb.de
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/isdn/capi/kcapi_proc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/isdn/capi/kcapi_proc.c b/drivers/isdn/capi/kcapi_proc.c
-index c94bd12c0f7c6..28cd051f1dfd9 100644
---- a/drivers/isdn/capi/kcapi_proc.c
-+++ b/drivers/isdn/capi/kcapi_proc.c
-@@ -239,7 +239,7 @@ kcapi_proc_init(void)
-       proc_create_seq("capi/driver",       0, NULL, &seq_capi_driver_ops);
- }
- 
--void __exit
-+void
- kcapi_proc_exit(void)
- {
-       remove_proc_entry("capi/driver",       NULL);
--- 
-2.20.1
-

diff --git a/queue-5.5/series b/queue-5.5/series
index d8b8be5836ef4fc196d1964f1209131df272ac22..a22629f8cc9362561c09315d9d0736c70646699a 100644 (file)
--- a/queue-5.5/series
+++ b/queue-5.5/series
@@ -142,7 +142,6 @@ reiserfs-fix-spurious-unlock-in-reiserfs_fill_super-.patch
 samples-bpf-set-fno-stack-protector-when-building-bp.patch
 r8169-check-that-realtek-phy-driver-module-is-loaded.patch
 fore200e-fix-incorrect-checks-of-null-pointer-derefe.patch
-isdn-don-t-mark-kcapi_proc_exit-as-__exit.patch
 x86-mce-therm_throt-mark-throttle_active_work-as-__m.patch
 arm-omap2-pdata-quirks-add-prm-data-for-reset-suppor.patch
 netfilter-nft_tunnel-add-the-missing-erspan_version-.patch