Rebase to upstream release v48.0

.gitignore

@@ -19,4 +19,3 @@
 /rdma-core-44.0.tar.gz
 /rdma-core-46.0.tar.gz
 /rdma-core-48.0.tar.gz
-/rdma-core-51.0.tar.gz

.rdma-core.metadata

@@ -1 +1 @@
-38c8fb4cfd3efb73d91d75b43cbf13e051d2044f rdma-core-51.0.tar.gz
+b5e5f57b1f5269213cbd088f83212e0f03b17a60 rdma-core-48.0.tar.gz

0003-CMakeLists-disable-providers-that-were-not-enabled-i.patch

@@ -0,0 +1,50 @@
+From 214c673b2a66a0ceb86a21ddb8cd7beba86cc6f3 Mon Sep 17 00:00:00 2001
+From: Michal Schmidt <mschmidt@redhat.com>
+Date: Wed, 1 Feb 2023 15:24:23 +0100
+Subject: [PATCH] CMakeLists: disable providers that were not enabled in RHEL
+ 9.1
+
+Doing a package rebase, but don't want to enable additional drivers
+unless explicitly requested.
+
+Upstream Status: RHEL only
+
+Signed-off-by: Michal Schmidt <mschmidt@redhat.com>
+---
+ CMakeLists.txt | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9b7462861012..cfe79bcfacf3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -711,7 +711,7 @@ add_subdirectory(providers/bnxt_re)
+ add_subdirectory(providers/cxgb4) # NO SPARSE
+ add_subdirectory(providers/efa)
+ add_subdirectory(providers/efa/man)
+-add_subdirectory(providers/erdma)
++#add_subdirectory(providers/erdma)
+ add_subdirectory(providers/hns)
+ add_subdirectory(providers/irdma)
+ add_subdirectory(providers/mana)
+@@ -720,14 +720,14 @@ add_subdirectory(providers/mlx4)
+ add_subdirectory(providers/mlx4/man)
+ add_subdirectory(providers/mlx5)
+ add_subdirectory(providers/mlx5/man)
+-add_subdirectory(providers/mthca)
+-add_subdirectory(providers/ocrdma)
++#add_subdirectory(providers/mthca)
++#add_subdirectory(providers/ocrdma)
+ add_subdirectory(providers/qedr)
+ add_subdirectory(providers/vmw_pvrdma)
+ endif()
+ 
+ add_subdirectory(providers/hfi1verbs)
+-add_subdirectory(providers/ipathverbs)
++#add_subdirectory(providers/ipathverbs)
+ add_subdirectory(providers/rxe)
+ add_subdirectory(providers/rxe/man)
+ add_subdirectory(providers/siw)
+-- 
+2.40.1
+

rdma-core.spec

@@ -1,5 +1,5 @@
 Name: rdma-core
-Version: 51.0
+Version: 48.0
 Release: 1%{?dist}
 Summary: RDMA core userspace libraries and daemons
 
@@ -10,6 +10,7 @@ Summary: RDMA core userspace libraries and daemons
 License: GPLv2 or BSD
 Url: https://github.com/linux-rdma/rdma-core
 Source: https://github.com/linux-rdma/rdma-core/releases/download/v%{version}/%{name}-%{version}.tar.gz
+Patch9000: 0003-CMakeLists-disable-providers-that-were-not-enabled-i.patch
 Patch9998: 9998-kernel-boot-Do-not-perform-device-rename-on-OPA-devi.patch
 Patch9999: 9999-udev-keep-NAME_KERNEL-as-default-interface-naming-co.patch
 # Do not build static libs by default.
@@ -270,6 +271,7 @@ easy, object-oriented access to IB verbs.
 %patch9998 -p1
 %endif
 %if 0%{?rhel}
+%patch9000 -p1
 %patch9999 -p1
 %endif
 
@@ -396,7 +398,6 @@ fi
 %config(noreplace) %{_sysconfdir}/rdma/modules/roce.conf
 %dir %{_sysconfdir}/modprobe.d
 %config(noreplace) %{_sysconfdir}/modprobe.d/mlx4.conf
-%config(noreplace) %{_sysconfdir}/modprobe.d/truescale.conf
 %{_unitdir}/rdma-hw.target
 %{_unitdir}/rdma-load-modules@.service
 %dir %{dracutlibdir}
@@ -414,7 +415,6 @@ fi
 %dir %{sysmodprobedir}
 %{sysmodprobedir}/libmlx4.conf
 %{_libexecdir}/mlx4-setup.sh
-%{_libexecdir}/truescale-serdes.cmds
 %{_sbindir}/rdma-ndd
 %{_unitdir}/rdma-ndd.service
 %{_mandir}/man7/rxe*
@@ -433,7 +433,6 @@ fi
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 %{_mandir}/man3/efadv*
-%{_mandir}/man3/hnsdv*
 %{_mandir}/man3/ibv_*
 %{_mandir}/man3/rdma*
 %{_mandir}/man3/umad*
@@ -443,7 +442,6 @@ fi
 %{_mandir}/man3/mlx4dv*
 %{_mandir}/man3/manadv*
 %{_mandir}/man7/efadv*
-%{_mandir}/man7/hnsdv*
 %{_mandir}/man7/mlx5dv*
 %{_mandir}/man7/mlx4dv*
 %{_mandir}/man7/manadv*
@@ -521,7 +519,6 @@ fi
 %dir %{_sysconfdir}/libibverbs.d
 %dir %{_libdir}/libibverbs
 %{_libdir}/libefa.so.*
-%{_libdir}/libhns.so.*
 %{_libdir}/libibverbs*.so.*
 %{_libdir}/libibverbs/*.so
 %{_libdir}/libmana.so.*
@@ -618,10 +615,6 @@ fi
 %endif
 
 %changelog
-* Mon Apr 22 2024 Kamal Heib <kheib@redhat.com> - 51.0-1
-- Rebase to upstream release v51.0
-- Resolves: RHEL-24473, RHEL-23180
-
 * Mon Sep 18 2023 Kamal Heib <kheib@redhat.com> - 48.0-1
 - Rebase to upstream release v48.0
 - Resolves: RHEL-884, RHEL-4800, RHEL-4799, RHEL-3527, RHEL-5486

sources

@@ -1 +1 @@
-SHA512 (rdma-core-51.0.tar.gz) = 25b92f4cf98172c00bdfc166666307be39fbdbc061e91c290fee9e932829df799e864019273cfd1f6118968bdfb3361b467d414f062b5bd7a269246c5857671d
+SHA512 (rdma-core-48.0.tar.gz) = 48303d830e83d4fb6a88e23764380872dadc4579e8a1a62275447fe4a6613aea9ac08876e4a58f5799af9455e6dabbced8bc8e1663812fe68a2d642a1152b195