drop rdma-bnxt_re-fix-error-handling-in-probe-failure-path.patch

diff --git a/queue-5.10/rdma-bnxt_re-fix-error-handling-in-probe-failure-path.patch b/queue-5.10/rdma-bnxt_re-fix-error-handling-in-probe-failure-path.patch
deleted file mode 100644 (file)
index 0c828ef..0000000
--- a/queue-5.10/rdma-bnxt_re-fix-error-handling-in-probe-failure-path.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 5ac8480ae4d01f0ca5dfd561884424046df2478a Mon Sep 17 00:00:00 2001
-From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
-Date: Wed, 9 Aug 2023 21:44:36 -0700
-Subject: RDMA/bnxt_re: Fix error handling in probe failure path
-
-From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
-
-commit 5ac8480ae4d01f0ca5dfd561884424046df2478a upstream.
-
-During bnxt_re_dev_init(), when bnxt_re_setup_chip_ctx() fails unregister
-with L2 first before bailing out probe.
-
-Fixes: ae8637e13185 ("RDMA/bnxt_re: Add chip context to identify 57500 series")
-Link: https://lore.kernel.org/r/1691642677-21369-3-git-send-email-selvin.xavier@broadcom.com
-Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
-Signed-off-by: Selvin Xavier <selvin.xavier@broadcom.com>
-Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/infiniband/hw/bnxt_re/main.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/infiniband/hw/bnxt_re/main.c
-+++ b/drivers/infiniband/hw/bnxt_re/main.c
-@@ -1418,6 +1418,8 @@ static int bnxt_re_dev_init(struct bnxt_
- 
-       rc = bnxt_re_setup_chip_ctx(rdev, wqe_mode);
-       if (rc) {
-+              bnxt_unregister_dev(rdev->en_dev);
-+              clear_bit(BNXT_RE_FLAG_NETDEV_REGISTERED, &rdev->flags);
-               ibdev_err(&rdev->ibdev, "Failed to get chip context\n");
-               return -EINVAL;
-       }

diff --git a/queue-5.10/series b/queue-5.10/series
index e615d26fd0b22ba57c07d0c1de8b60fd8f72688a..3a728f0e03e28cf39a08e0d3e4a21719e2bf5546 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -45,4 +45,3 @@ dccp-fix-data-race-around-dp-dccps_mss_cache.patch
 drivers-net-prevent-tun_build_skb-to-exceed-the-packet-size-limit.patch
 ib-hfi1-fix-possible-panic-during-hotplug-remove.patch
 wifi-cfg80211-fix-sband-iftype-data-lookup-for-ap_vlan.patch
-rdma-bnxt_re-fix-error-handling-in-probe-failure-path.patch

diff --git a/queue-5.15/rdma-bnxt_re-fix-error-handling-in-probe-failure-path.patch b/queue-5.15/rdma-bnxt_re-fix-error-handling-in-probe-failure-path.patch
deleted file mode 100644 (file)
index a7dae0d..0000000
--- a/queue-5.15/rdma-bnxt_re-fix-error-handling-in-probe-failure-path.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 5ac8480ae4d01f0ca5dfd561884424046df2478a Mon Sep 17 00:00:00 2001
-From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
-Date: Wed, 9 Aug 2023 21:44:36 -0700
-Subject: RDMA/bnxt_re: Fix error handling in probe failure path
-
-From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
-
-commit 5ac8480ae4d01f0ca5dfd561884424046df2478a upstream.
-
-During bnxt_re_dev_init(), when bnxt_re_setup_chip_ctx() fails unregister
-with L2 first before bailing out probe.
-
-Fixes: ae8637e13185 ("RDMA/bnxt_re: Add chip context to identify 57500 series")
-Link: https://lore.kernel.org/r/1691642677-21369-3-git-send-email-selvin.xavier@broadcom.com
-Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
-Signed-off-by: Selvin Xavier <selvin.xavier@broadcom.com>
-Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/infiniband/hw/bnxt_re/main.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/infiniband/hw/bnxt_re/main.c
-+++ b/drivers/infiniband/hw/bnxt_re/main.c
-@@ -1406,6 +1406,8 @@ static int bnxt_re_dev_init(struct bnxt_
- 
-       rc = bnxt_re_setup_chip_ctx(rdev, wqe_mode);
-       if (rc) {
-+              bnxt_unregister_dev(rdev->en_dev);
-+              clear_bit(BNXT_RE_FLAG_NETDEV_REGISTERED, &rdev->flags);
-               ibdev_err(&rdev->ibdev, "Failed to get chip context\n");
-               return -EINVAL;
-       }

diff --git a/queue-5.15/series b/queue-5.15/series
index 579a56659969d53327caf69366453f903ea2cd80..c897dd71adf725811cb11dc4ac18fd9be9639da6 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -56,4 +56,3 @@ ib-hfi1-fix-possible-panic-during-hotplug-remove.patch
 drm-rockchip-don-t-spam-logs-in-atomic-check.patch
 wifi-cfg80211-fix-sband-iftype-data-lookup-for-ap_vlan.patch
 rdma-umem-set-iova-in-odp-flow.patch
-rdma-bnxt_re-fix-error-handling-in-probe-failure-path.patch

diff --git a/queue-6.1/net-marvell-prestera-fix-handling-ipv4-routes-with-nhid.patch b/queue-6.1/net-marvell-prestera-fix-handling-ipv4-routes-with-nhid.patch
index a11d30ebcb8a9c17dbd5becd7b0c58dd14116586..284ac104386855a1c0107fc7e3b6633ed2e8e873 100644 (file)
--- a/queue-6.1/net-marvell-prestera-fix-handling-ipv4-routes-with-nhid.patch
+++ b/queue-6.1/net-marvell-prestera-fix-handling-ipv4-routes-with-nhid.patch
@@ -109,14 +109,12 @@ Link: https://lore.kernel.org/r/20230804101220.247515-1-jonas.gorski@bisdn.de
 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- .../ethernet/marvell/prestera/prestera_router.c    | 14 +++++++-------
+ drivers/net/ethernet/marvell/prestera/prestera_router.c |   14 +++++++-------
  1 file changed, 7 insertions(+), 7 deletions(-)
 
-diff --git a/drivers/net/ethernet/marvell/prestera/prestera_router.c b/drivers/net/ethernet/marvell/prestera/prestera_router.c
-index a9a1028cb17b..de317179a7dc 100644
 --- a/drivers/net/ethernet/marvell/prestera/prestera_router.c
 +++ b/drivers/net/ethernet/marvell/prestera/prestera_router.c
-@@ -166,11 +166,11 @@ prestera_util_neigh2nc_key(struct prestera_switch *sw, struct neighbour *n,
+@@ -166,11 +166,11 @@ prestera_util_neigh2nc_key(struct preste
  
  static bool __prestera_fi_is_direct(struct fib_info *fi)
  {
@@ -140,7 +138,7 @@ index a9a1028cb17b..de317179a7dc 100644
        struct fib_result res;
        bool reachable;
  
-@@ -269,8 +269,8 @@ __prestera_util_kern_n_is_reachable_v4(u32 tb_id, __be32 *addr,
+@@ -269,8 +269,8 @@ __prestera_util_kern_n_is_reachable_v4(u
  
        if (!prestera_util_kern_get_route(&res, tb_id, addr))
                if (prestera_fi_is_direct(res.fi)) {
@@ -151,7 +149,7 @@ index a9a1028cb17b..de317179a7dc 100644
                                reachable = true;
                }
  
-@@ -324,7 +324,7 @@ prestera_kern_fib_info_nhc(struct fib_notifier_info *info, int n)
+@@ -324,7 +324,7 @@ prestera_kern_fib_info_nhc(struct fib_no
        if (info->family == AF_INET) {
                fen4_info = container_of(info, struct fib_entry_notifier_info,
                                         info);
@@ -160,6 +158,3 @@ index a9a1028cb17b..de317179a7dc 100644
        } else if (info->family == AF_INET6) {
                fen6_info = container_of(info, struct fib6_entry_notifier_info,
                                         info);
--- 
-2.41.0
-

diff --git a/queue-6.1/rdma-bnxt_re-fix-error-handling-in-probe-failure-path.patch b/queue-6.1/rdma-bnxt_re-fix-error-handling-in-probe-failure-path.patch
deleted file mode 100644 (file)
index 78c7380..0000000
--- a/queue-6.1/rdma-bnxt_re-fix-error-handling-in-probe-failure-path.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 5ac8480ae4d01f0ca5dfd561884424046df2478a Mon Sep 17 00:00:00 2001
-From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
-Date: Wed, 9 Aug 2023 21:44:36 -0700
-Subject: RDMA/bnxt_re: Fix error handling in probe failure path
-
-From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
-
-commit 5ac8480ae4d01f0ca5dfd561884424046df2478a upstream.
-
-During bnxt_re_dev_init(), when bnxt_re_setup_chip_ctx() fails unregister
-with L2 first before bailing out probe.
-
-Fixes: ae8637e13185 ("RDMA/bnxt_re: Add chip context to identify 57500 series")
-Link: https://lore.kernel.org/r/1691642677-21369-3-git-send-email-selvin.xavier@broadcom.com
-Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
-Signed-off-by: Selvin Xavier <selvin.xavier@broadcom.com>
-Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/infiniband/hw/bnxt_re/main.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/infiniband/hw/bnxt_re/main.c
-+++ b/drivers/infiniband/hw/bnxt_re/main.c
-@@ -1409,6 +1409,8 @@ static int bnxt_re_dev_init(struct bnxt_
- 
-       rc = bnxt_re_setup_chip_ctx(rdev, wqe_mode);
-       if (rc) {
-+              bnxt_unregister_dev(rdev->en_dev);
-+              clear_bit(BNXT_RE_FLAG_NETDEV_REGISTERED, &rdev->flags);
-               ibdev_err(&rdev->ibdev, "Failed to get chip context\n");
-               return -EINVAL;
-       }

diff --git a/queue-6.1/series b/queue-6.1/series
index 295b345039064ed561d5fade5d66be8e4470f8bd..2e9a8fd587d5c4d60bf63cd3e79d74cc84f9d2b4 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -101,6 +101,5 @@ ib-hfi1-fix-possible-panic-during-hotplug-remove.patch
 drm-rockchip-don-t-spam-logs-in-atomic-check.patch
 wifi-cfg80211-fix-sband-iftype-data-lookup-for-ap_vlan.patch
 rdma-umem-set-iova-in-odp-flow.patch
-rdma-bnxt_re-fix-error-handling-in-probe-failure-path.patch
 net-tls-avoid-discarding-data-on-record-close.patch
 net-marvell-prestera-fix-handling-ipv4-routes-with-nhid.patch