drop ib-rdmavt-add-__init-__exit-annotations-to-module-in.patch

diff --git a/queue-4.14/ib-rdmavt-add-__init-__exit-annotations-to-module-in.patch b/queue-4.14/ib-rdmavt-add-__init-__exit-annotations-to-module-in.patch
deleted file mode 100644 (file)
index 9579bc0..0000000
--- a/queue-4.14/ib-rdmavt-add-__init-__exit-annotations-to-module-in.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From f21e87df9f9b0eab5c1a0d6a87f936021584063a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sat, 24 Sep 2022 17:14:57 +0800
-Subject: IB/rdmavt: Add __init/__exit annotations to module init/exit funcs
-
-From: Xiu Jianfeng <xiujianfeng@huawei.com>
-
-[ Upstream commit 78657a445ca7603024348781c921f8ecaee10a49 ]
-
-Add missing __init/__exit annotations to module init/exit funcs.
-
-Fixes: 0194621b2253 ("IB/rdmavt: Create module framework and handle driver registration")
-Link: https://lore.kernel.org/r/20220924091457.52446-1-xiujianfeng@huawei.com
-Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
-Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/infiniband/sw/rdmavt/vt.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/infiniband/sw/rdmavt/vt.c b/drivers/infiniband/sw/rdmavt/vt.c
-index 03a367db38e6..25ae07373804 100644
---- a/drivers/infiniband/sw/rdmavt/vt.c
-+++ b/drivers/infiniband/sw/rdmavt/vt.c
-@@ -56,7 +56,7 @@
- MODULE_LICENSE("Dual BSD/GPL");
- MODULE_DESCRIPTION("RDMA Verbs Transport Library");
- 
--static int rvt_init(void)
-+static int __init rvt_init(void)
- {
-       /*
-        * rdmavt does not need to do anything special when it starts up. All it
-@@ -66,7 +66,7 @@ static int rvt_init(void)
- }
- module_init(rvt_init);
- 
--static void rvt_cleanup(void)
-+static void __exit rvt_cleanup(void)
- {
-       /*
-        * Nothing to do at exit time either. The module won't be able to be
--- 
-2.35.1
-

diff --git a/queue-4.14/series b/queue-4.14/series
index 6d87614425cfed87a2711e1d82341ed5ecee9518..1a643ff31514c81248d46ec9dc2692c6597a5e70 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -140,7 +140,6 @@ drivers-serial-jsm-fix-some-leaks-in-probe.patch
 phy-qualcomm-call-clk_disable_unprepare-in-the-error.patch
 firmware-google-test-spinlock-on-panic-path-to-avoid.patch
 serial-8250-fix-restoring-termios-speed-after-suspen.patch
-ib-rdmavt-add-__init-__exit-annotations-to-module-in.patch
 fsi-core-check-error-number-after-calling-ida_simple.patch
 mfd-intel_soc_pmic-fix-an-error-handling-path-in-int.patch
 mfd-fsl-imx25-fix-an-error-handling-path-in-mx25_tsa.patch

diff --git a/queue-4.19/ib-rdmavt-add-__init-__exit-annotations-to-module-in.patch b/queue-4.19/ib-rdmavt-add-__init-__exit-annotations-to-module-in.patch
deleted file mode 100644 (file)
index bc35004..0000000
--- a/queue-4.19/ib-rdmavt-add-__init-__exit-annotations-to-module-in.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 5ecdb25dee2df4e1c0000fda9cc3efcda174a666 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sat, 24 Sep 2022 17:14:57 +0800
-Subject: IB/rdmavt: Add __init/__exit annotations to module init/exit funcs
-
-From: Xiu Jianfeng <xiujianfeng@huawei.com>
-
-[ Upstream commit 78657a445ca7603024348781c921f8ecaee10a49 ]
-
-Add missing __init/__exit annotations to module init/exit funcs.
-
-Fixes: 0194621b2253 ("IB/rdmavt: Create module framework and handle driver registration")
-Link: https://lore.kernel.org/r/20220924091457.52446-1-xiujianfeng@huawei.com
-Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
-Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/infiniband/sw/rdmavt/vt.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/infiniband/sw/rdmavt/vt.c b/drivers/infiniband/sw/rdmavt/vt.c
-index 541ee30727aa..e6d85fcc2624 100644
---- a/drivers/infiniband/sw/rdmavt/vt.c
-+++ b/drivers/infiniband/sw/rdmavt/vt.c
-@@ -57,7 +57,7 @@
- MODULE_LICENSE("Dual BSD/GPL");
- MODULE_DESCRIPTION("RDMA Verbs Transport Library");
- 
--static int rvt_init(void)
-+static int __init rvt_init(void)
- {
-       int ret = rvt_driver_cq_init();
- 
-@@ -68,7 +68,7 @@ static int rvt_init(void)
- }
- module_init(rvt_init);
- 
--static void rvt_cleanup(void)
-+static void __exit rvt_cleanup(void)
- {
-       rvt_cq_exit();
- }
--- 
-2.35.1
-

diff --git a/queue-4.19/series b/queue-4.19/series
index e4422c8f56a2ccb6743486f9499a271f693e2b91..dd3576b7f417e45835d402bbd94aab50e7e132a6 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -151,7 +151,6 @@ phy-qualcomm-call-clk_disable_unprepare-in-the-error.patch
 staging-vt6655-fix-some-erroneous-memory-clean-up-lo.patch
 firmware-google-test-spinlock-on-panic-path-to-avoid.patch
 serial-8250-fix-restoring-termios-speed-after-suspen.patch
-ib-rdmavt-add-__init-__exit-annotations-to-module-in.patch
 fsi-core-check-error-number-after-calling-ida_simple.patch
 mfd-intel_soc_pmic-fix-an-error-handling-path-in-int.patch
 mfd-fsl-imx25-fix-an-error-handling-path-in-mx25_tsa.patch

diff --git a/queue-4.9/ib-rdmavt-add-__init-__exit-annotations-to-module-in.patch b/queue-4.9/ib-rdmavt-add-__init-__exit-annotations-to-module-in.patch
deleted file mode 100644 (file)
index 4ae2324..0000000
--- a/queue-4.9/ib-rdmavt-add-__init-__exit-annotations-to-module-in.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From f96d9633e0a4e6708bbd9d168edc2f008190a16c Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sat, 24 Sep 2022 17:14:57 +0800
-Subject: IB/rdmavt: Add __init/__exit annotations to module init/exit funcs
-
-From: Xiu Jianfeng <xiujianfeng@huawei.com>
-
-[ Upstream commit 78657a445ca7603024348781c921f8ecaee10a49 ]
-
-Add missing __init/__exit annotations to module init/exit funcs.
-
-Fixes: 0194621b2253 ("IB/rdmavt: Create module framework and handle driver registration")
-Link: https://lore.kernel.org/r/20220924091457.52446-1-xiujianfeng@huawei.com
-Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
-Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/infiniband/sw/rdmavt/vt.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/infiniband/sw/rdmavt/vt.c b/drivers/infiniband/sw/rdmavt/vt.c
-index 1a1d7329fbb2..747de2e4f0eb 100644
---- a/drivers/infiniband/sw/rdmavt/vt.c
-+++ b/drivers/infiniband/sw/rdmavt/vt.c
-@@ -55,7 +55,7 @@
- MODULE_LICENSE("Dual BSD/GPL");
- MODULE_DESCRIPTION("RDMA Verbs Transport Library");
- 
--static int rvt_init(void)
-+static int __init rvt_init(void)
- {
-       /*
-        * rdmavt does not need to do anything special when it starts up. All it
-@@ -65,7 +65,7 @@ static int rvt_init(void)
- }
- module_init(rvt_init);
- 
--static void rvt_cleanup(void)
-+static void __exit rvt_cleanup(void)
- {
-       /*
-        * Nothing to do at exit time either. The module won't be able to be
--- 
-2.35.1
-

diff --git a/queue-4.9/series b/queue-4.9/series
index a17582c6f300eca35264f8d26593766f9de23161..b1802435eb02f6616ef5c16a9bde4f26fbf3766e 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -109,7 +109,6 @@ ata-fix-ata_id_has_dipm.patch
 drivers-serial-jsm-fix-some-leaks-in-probe.patch
 firmware-google-test-spinlock-on-panic-path-to-avoid.patch
 serial-8250-fix-restoring-termios-speed-after-suspen.patch
-ib-rdmavt-add-__init-__exit-annotations-to-module-in.patch
 mfd-intel_soc_pmic-fix-an-error-handling-path-in-int.patch
 mfd-lp8788-fix-an-error-handling-path-in-lp8788_prob.patch
 mfd-lp8788-fix-an-error-handling-path-in-lp8788_irq_.patch

diff --git a/queue-5.10/ib-rdmavt-add-__init-__exit-annotations-to-module-in.patch b/queue-5.10/ib-rdmavt-add-__init-__exit-annotations-to-module-in.patch
deleted file mode 100644 (file)
index dc65900..0000000
--- a/queue-5.10/ib-rdmavt-add-__init-__exit-annotations-to-module-in.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 03fcf6a87ec290029fff7ebb86862056af9c901d Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sat, 24 Sep 2022 17:14:57 +0800
-Subject: IB/rdmavt: Add __init/__exit annotations to module init/exit funcs
-
-From: Xiu Jianfeng <xiujianfeng@huawei.com>
-
-[ Upstream commit 78657a445ca7603024348781c921f8ecaee10a49 ]
-
-Add missing __init/__exit annotations to module init/exit funcs.
-
-Fixes: 0194621b2253 ("IB/rdmavt: Create module framework and handle driver registration")
-Link: https://lore.kernel.org/r/20220924091457.52446-1-xiujianfeng@huawei.com
-Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
-Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/infiniband/sw/rdmavt/vt.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/infiniband/sw/rdmavt/vt.c b/drivers/infiniband/sw/rdmavt/vt.c
-index d1bbe66610cf..f2734809812d 100644
---- a/drivers/infiniband/sw/rdmavt/vt.c
-+++ b/drivers/infiniband/sw/rdmavt/vt.c
-@@ -57,7 +57,7 @@
- MODULE_LICENSE("Dual BSD/GPL");
- MODULE_DESCRIPTION("RDMA Verbs Transport Library");
- 
--static int rvt_init(void)
-+static int __init rvt_init(void)
- {
-       int ret = rvt_driver_cq_init();
- 
-@@ -68,7 +68,7 @@ static int rvt_init(void)
- }
- module_init(rvt_init);
- 
--static void rvt_cleanup(void)
-+static void __exit rvt_cleanup(void)
- {
-       rvt_cq_exit();
- }
--- 
-2.35.1
-

diff --git a/queue-5.10/series b/queue-5.10/series
index c09e71a2d5aae287753d66d1514ecb0f99ad69bb..f0700edd873f82e7d26c2898363b8af7c16a0bf3 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -280,7 +280,6 @@ scsi-iscsi-iscsi_tcp-fix-null-ptr-deref-while-callin.patch
 clk-qcom-clk-rcg2-add-rcg2-mux-ops.patch
 clk-qcom-apss-ipq6018-fix-apcs_alias0_clk_src.patch
 clk-qcom-apss-ipq6018-mark-apcs_alias0_core_clk-as-c.patch
-ib-rdmavt-add-__init-__exit-annotations-to-module-in.patch
 fsi-core-check-error-number-after-calling-ida_simple.patch
 mfd-intel_soc_pmic-fix-an-error-handling-path-in-int.patch
 mfd-fsl-imx25-fix-an-error-handling-path-in-mx25_tsa.patch

diff --git a/queue-5.15/ib-rdmavt-add-__init-__exit-annotations-to-module-in.patch b/queue-5.15/ib-rdmavt-add-__init-__exit-annotations-to-module-in.patch
deleted file mode 100644 (file)
index 4c4868c..0000000
--- a/queue-5.15/ib-rdmavt-add-__init-__exit-annotations-to-module-in.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 55d6a7a2d1eda054b07ffe7793166794cedbabe0 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sat, 24 Sep 2022 17:14:57 +0800
-Subject: IB/rdmavt: Add __init/__exit annotations to module init/exit funcs
-
-From: Xiu Jianfeng <xiujianfeng@huawei.com>
-
-[ Upstream commit 78657a445ca7603024348781c921f8ecaee10a49 ]
-
-Add missing __init/__exit annotations to module init/exit funcs.
-
-Fixes: 0194621b2253 ("IB/rdmavt: Create module framework and handle driver registration")
-Link: https://lore.kernel.org/r/20220924091457.52446-1-xiujianfeng@huawei.com
-Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
-Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/infiniband/sw/rdmavt/vt.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/infiniband/sw/rdmavt/vt.c b/drivers/infiniband/sw/rdmavt/vt.c
-index 59481ae39505..d61f8de7f21c 100644
---- a/drivers/infiniband/sw/rdmavt/vt.c
-+++ b/drivers/infiniband/sw/rdmavt/vt.c
-@@ -15,7 +15,7 @@
- MODULE_LICENSE("Dual BSD/GPL");
- MODULE_DESCRIPTION("RDMA Verbs Transport Library");
- 
--static int rvt_init(void)
-+static int __init rvt_init(void)
- {
-       int ret = rvt_driver_cq_init();
- 
-@@ -26,7 +26,7 @@ static int rvt_init(void)
- }
- module_init(rvt_init);
- 
--static void rvt_cleanup(void)
-+static void __exit rvt_cleanup(void)
- {
-       rvt_cq_exit();
- }
--- 
-2.35.1
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 2f8a7bf9f66466fb15133f5189b893b5a9ae52e4..e0be9482130e3759cd096ad1b0001325dfedbbd0 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -387,7 +387,6 @@ clk-qcom-apss-ipq6018-fix-apcs_alias0_clk_src.patch
 clk-qcom-apss-ipq6018-mark-apcs_alias0_core_clk-as-c.patch
 clk-qcom-gcc-sm6115-override-default-alpha-pll-regs.patch
 rdma-rxe-fix-resize_finish-in-rxe_queue.c.patch
-ib-rdmavt-add-__init-__exit-annotations-to-module-in.patch
 fsi-core-check-error-number-after-calling-ida_simple.patch
 mfd-intel_soc_pmic-fix-an-error-handling-path-in-int.patch
 mfd-fsl-imx25-fix-an-error-handling-path-in-mx25_tsa.patch

diff --git a/queue-5.19/ib-rdmavt-add-__init-__exit-annotations-to-module-in.patch b/queue-5.19/ib-rdmavt-add-__init-__exit-annotations-to-module-in.patch
deleted file mode 100644 (file)
index bd638fc..0000000
--- a/queue-5.19/ib-rdmavt-add-__init-__exit-annotations-to-module-in.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 90c19f0c76d7edd9e5c09d5cc2dca6401d3a3104 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sat, 24 Sep 2022 17:14:57 +0800
-Subject: IB/rdmavt: Add __init/__exit annotations to module init/exit funcs
-
-From: Xiu Jianfeng <xiujianfeng@huawei.com>
-
-[ Upstream commit 78657a445ca7603024348781c921f8ecaee10a49 ]
-
-Add missing __init/__exit annotations to module init/exit funcs.
-
-Fixes: 0194621b2253 ("IB/rdmavt: Create module framework and handle driver registration")
-Link: https://lore.kernel.org/r/20220924091457.52446-1-xiujianfeng@huawei.com
-Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
-Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/infiniband/sw/rdmavt/vt.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/infiniband/sw/rdmavt/vt.c b/drivers/infiniband/sw/rdmavt/vt.c
-index 59481ae39505..d61f8de7f21c 100644
---- a/drivers/infiniband/sw/rdmavt/vt.c
-+++ b/drivers/infiniband/sw/rdmavt/vt.c
-@@ -15,7 +15,7 @@
- MODULE_LICENSE("Dual BSD/GPL");
- MODULE_DESCRIPTION("RDMA Verbs Transport Library");
- 
--static int rvt_init(void)
-+static int __init rvt_init(void)
- {
-       int ret = rvt_driver_cq_init();
- 
-@@ -26,7 +26,7 @@ static int rvt_init(void)
- }
- module_init(rvt_init);
- 
--static void rvt_cleanup(void)
-+static void __exit rvt_cleanup(void)
- {
-       rvt_cq_exit();
- }
--- 
-2.35.1
-

diff --git a/queue-5.19/series b/queue-5.19/series
index ee0949faabdb1eee572dd254d95d5c32242d3b57..08648e07fd5dd1c2ababbf8455fffed2d800f95f 100644 (file)
--- a/queue-5.19/series
+++ b/queue-5.19/series
@@ -521,7 +521,6 @@ clk-qcom-gcc-sm6115-override-default-alpha-pll-regs.patch
 rdma-rxe-stop-lookup-of-partially-built-objects.patch
 rdma-rxe-set-pd-early-in-mr-alloc-routines.patch
 rdma-rxe-fix-resize_finish-in-rxe_queue.c.patch
-ib-rdmavt-add-__init-__exit-annotations-to-module-in.patch
 fsi-core-check-error-number-after-calling-ida_simple.patch
 mfd-intel_soc_pmic-fix-an-error-handling-path-in-int.patch
 mfd-fsl-imx25-fix-an-error-handling-path-in-mx25_tsa.patch

diff --git a/queue-5.4/ib-rdmavt-add-__init-__exit-annotations-to-module-in.patch b/queue-5.4/ib-rdmavt-add-__init-__exit-annotations-to-module-in.patch
deleted file mode 100644 (file)
index ed98a6f..0000000
--- a/queue-5.4/ib-rdmavt-add-__init-__exit-annotations-to-module-in.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 8d003506fdf6984b45fd36d42514af1526ec960d Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sat, 24 Sep 2022 17:14:57 +0800
-Subject: IB/rdmavt: Add __init/__exit annotations to module init/exit funcs
-
-From: Xiu Jianfeng <xiujianfeng@huawei.com>
-
-[ Upstream commit 78657a445ca7603024348781c921f8ecaee10a49 ]
-
-Add missing __init/__exit annotations to module init/exit funcs.
-
-Fixes: 0194621b2253 ("IB/rdmavt: Create module framework and handle driver registration")
-Link: https://lore.kernel.org/r/20220924091457.52446-1-xiujianfeng@huawei.com
-Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
-Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/infiniband/sw/rdmavt/vt.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/infiniband/sw/rdmavt/vt.c b/drivers/infiniband/sw/rdmavt/vt.c
-index 833f3f1b87f5..f69fffa6e613 100644
---- a/drivers/infiniband/sw/rdmavt/vt.c
-+++ b/drivers/infiniband/sw/rdmavt/vt.c
-@@ -57,7 +57,7 @@
- MODULE_LICENSE("Dual BSD/GPL");
- MODULE_DESCRIPTION("RDMA Verbs Transport Library");
- 
--static int rvt_init(void)
-+static int __init rvt_init(void)
- {
-       int ret = rvt_driver_cq_init();
- 
-@@ -68,7 +68,7 @@ static int rvt_init(void)
- }
- module_init(rvt_init);
- 
--static void rvt_cleanup(void)
-+static void __exit rvt_cleanup(void)
- {
-       rvt_cq_exit();
- }
--- 
-2.35.1
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 3b9c6ce39543d868fb4867e6d478fb772db32273..0dd397c3f23ab3cfbe403efee1f2fbf74acaf674 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -158,7 +158,6 @@ staging-vt6655-fix-some-erroneous-memory-clean-up-lo.patch
 firmware-google-test-spinlock-on-panic-path-to-avoid.patch
 serial-8250-fix-restoring-termios-speed-after-suspen.patch
 scsi-libsas-fix-use-after-free-bug-in-smp_execute_ta.patch
-ib-rdmavt-add-__init-__exit-annotations-to-module-in.patch
 fsi-core-check-error-number-after-calling-ida_simple.patch
 mfd-intel_soc_pmic-fix-an-error-handling-path-in-int.patch
 mfd-fsl-imx25-fix-an-error-handling-path-in-mx25_tsa.patch

diff --git a/queue-6.0/ib-rdmavt-add-__init-__exit-annotations-to-module-in.patch b/queue-6.0/ib-rdmavt-add-__init-__exit-annotations-to-module-in.patch
deleted file mode 100644 (file)
index 55e92ea..0000000
--- a/queue-6.0/ib-rdmavt-add-__init-__exit-annotations-to-module-in.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 07026237915f2a67e8a5a22b2430dc22905484e2 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sat, 24 Sep 2022 17:14:57 +0800
-Subject: IB/rdmavt: Add __init/__exit annotations to module init/exit funcs
-
-From: Xiu Jianfeng <xiujianfeng@huawei.com>
-
-[ Upstream commit 78657a445ca7603024348781c921f8ecaee10a49 ]
-
-Add missing __init/__exit annotations to module init/exit funcs.
-
-Fixes: 0194621b2253 ("IB/rdmavt: Create module framework and handle driver registration")
-Link: https://lore.kernel.org/r/20220924091457.52446-1-xiujianfeng@huawei.com
-Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
-Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/infiniband/sw/rdmavt/vt.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/infiniband/sw/rdmavt/vt.c b/drivers/infiniband/sw/rdmavt/vt.c
-index 59481ae39505..d61f8de7f21c 100644
---- a/drivers/infiniband/sw/rdmavt/vt.c
-+++ b/drivers/infiniband/sw/rdmavt/vt.c
-@@ -15,7 +15,7 @@
- MODULE_LICENSE("Dual BSD/GPL");
- MODULE_DESCRIPTION("RDMA Verbs Transport Library");
- 
--static int rvt_init(void)
-+static int __init rvt_init(void)
- {
-       int ret = rvt_driver_cq_init();
- 
-@@ -26,7 +26,7 @@ static int rvt_init(void)
- }
- module_init(rvt_init);
- 
--static void rvt_cleanup(void)
-+static void __exit rvt_cleanup(void)
- {
-       rvt_cq_exit();
- }
--- 
-2.35.1
-

diff --git a/queue-6.0/series b/queue-6.0/series
index 30b1f82f3b67454f4ddf75518c186a64106ff012..8b5b7e21a4d7a5ec6de9356a5ef66713e9828dd7 100644 (file)
--- a/queue-6.0/series
+++ b/queue-6.0/series
@@ -589,7 +589,6 @@ clk-qcom-gcc-sm6115-override-default-alpha-pll-regs.patch
 nvmet-auth-don-t-try-to-cancel-a-non-initialized-wor.patch
 rdma-rxe-set-pd-early-in-mr-alloc-routines.patch
 rdma-rxe-fix-resize_finish-in-rxe_queue.c.patch
-ib-rdmavt-add-__init-__exit-annotations-to-module-in.patch
 fsi-core-check-error-number-after-calling-ida_simple.patch
 mfd-intel_soc_pmic-fix-an-error-handling-path-in-int.patch
 mfd-fsl-imx25-fix-an-error-handling-path-in-mx25_tsa.patch