Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/rdma-core.git#f16deff513eac0627c39c61ce536cb1eb86ed684

.gitignore

@@ -11,3 +11,4 @@
 /rdma-core-30.0.tar.gz
 /rdma-core-31.0.tar.gz
 /rdma-core-33.0.tar.gz
+/rdma-core-34.0.tar.gz

0001-kernel-boot-Do-not-perform-device-rename-on-OPA-devi.patch

@@ -1,4 +1,4 @@
-From d9a376151c8a0d30ea814704e844f3aa3359d984 Mon Sep 17 00:00:00 2001
+From 1c63f25b55ca4f5317e1c85b548469bbc747e147 Mon Sep 17 00:00:00 2001
 From: "Goldman, Adam" <adam.goldman@intel.com>
 Date: Tue, 4 Feb 2020 08:55:20 -0500
 Subject: [PATCH] kernel-boot: Do not perform device rename on OPA devices
@@ -16,19 +16,27 @@ Fixes: 5b4099d47be3 ("kernel-boot: Perform device rename to make stable names")
 Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
 Signed-off-by: Goldman, Adam <adam.goldman@intel.com>
 ---
- kernel-boot/rdma-persistent-naming.rules | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ kernel-boot/rdma-persistent-naming.rules | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/kernel-boot/rdma-persistent-naming.rules b/kernel-boot/rdma-persistent-naming.rules
-index 9b61e1630d56..95d6851fb97a 100644
+index 6f9c53a5..3ce34ea9 100644
 --- a/kernel-boot/rdma-persistent-naming.rules
 +++ b/kernel-boot/rdma-persistent-naming.rules
-@@ -25,4 +25,4 @@
+@@ -26,10 +26,10 @@
  #   Device type = RoCE
  #   mlx5_0 -> rocex525400c0fe123455
  #
 -ACTION=="add", SUBSYSTEM=="infiniband", PROGRAM="rdma_rename %k NAME_FALLBACK"
 +ACTION=="add", SUBSYSTEM=="infiniband", KERNEL!="hfi1*", PROGRAM="rdma_rename %k NAME_FALLBACK"
+ 
+ # Example:
+ # * NAME_FIXED 
+ #   fixed name for specific board_id
+ #
+-#ACTION=="add", ATTR{board_id}=="MSF0010110035", SUBSYSTEM=="infiniband", PROGRAM="rdma_rename %k NAME_FIXED myib"
+\ No newline at end of file
++#ACTION=="add", ATTR{board_id}=="MSF0010110035", SUBSYSTEM=="infiniband", PROGRAM="rdma_rename %k NAME_FIXED myib"
 -- 
-2.24.1
+2.30.1
 

rdma-core.spec

@@ -1,6 +1,6 @@
 Name: rdma-core
-Version: 33.0
-Release: 5%{?dist}
+Version: 34.0
+Release: 1%{?dist}
 Summary: RDMA core userspace libraries and daemons
 
 # Almost everything is licensed under the OFA dual GPLv2, 2 Clause BSD license
@@ -653,6 +653,9 @@ fi
 %endif
 
 %changelog
+* Wed Mar 03 2021 Honggang Li <honli@redhat.com> - 34.0-1
+- Rebase to upstream release v34.0
+
 * Mon Feb 01 2021 Honggang Li <honli@redhat.com> - 33.0-5
 - Disable HCA rename for ELN
 

sources

@@ -1 +1 @@
-SHA512 (rdma-core-33.0.tar.gz) = 32b15cbc256dabd97acaaa040ceb62ccd6b0193617fa17d2a410c9360ef85beb029cc611b2d78edc876555995a5cdd54325ac4b7fb9bec46b0a05a0704462e06
+SHA512 (rdma-core-34.0.tar.gz) = f30a1b41e253c6e19ffb81ee09d09dea274cbeae8c7ee8b81fbddd33f4b0c7706ec4ed35c5db0bcb5c2bdf4a1c52df781e10330494711783e4cd658d44f02d70

udev-keep-NAME_KERNEL-as-default-interface-naming-co.patch

@@ -1,24 +1,31 @@
-From fd9b3596cb1a21e54ffb102392178b6bd5d14c78 Mon Sep 17 00:00:00 2001
+From 538cd05b34bf15076ce40273926d7580d421a670 Mon Sep 17 00:00:00 2001
 From: Jarod Wilson <jarod@redhat.com>
 Date: Wed, 21 Aug 2019 17:09:13 -0400
-Subject: [PATCH rdma-core] udev: keep NAME_KERNEL as default interface
- naming convention
+Subject: [PATCH] udev: keep NAME_KERNEL as default interface naming convention
 
 Signed-off-by: Jarod Wilson <jarod@redhat.com>
 ---
- kernel-boot/rdma-persistent-naming.rules | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ kernel-boot/rdma-persistent-naming.rules | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/kernel-boot/rdma-persistent-naming.rules b/kernel-boot/rdma-persistent-naming.rules
-index 9b61e163..a561746b 100644
+index 6f9c53a5..b5413edb 100644
 --- a/kernel-boot/rdma-persistent-naming.rules
 +++ b/kernel-boot/rdma-persistent-naming.rules
-@@ -25,4 +25,4 @@
+@@ -26,10 +26,10 @@
  #   Device type = RoCE
  #   mlx5_0 -> rocex525400c0fe123455
  #
 -ACTION=="add", SUBSYSTEM=="infiniband", PROGRAM="rdma_rename %k NAME_FALLBACK"
 +ACTION=="add", SUBSYSTEM=="infiniband", PROGRAM="rdma_rename %k NAME_KERNEL"
+ 
+ # Example:
+ # * NAME_FIXED 
+ #   fixed name for specific board_id
+ #
+-#ACTION=="add", ATTR{board_id}=="MSF0010110035", SUBSYSTEM=="infiniband", PROGRAM="rdma_rename %k NAME_FIXED myib"
+\ No newline at end of file
++#ACTION=="add", ATTR{board_id}=="MSF0010110035", SUBSYSTEM=="infiniband", PROGRAM="rdma_rename %k NAME_FIXED myib"
 -- 
-2.20.1
+2.30.1