summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2020-10-26 10:21:26 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2020-10-26 10:21:26 -0500
commit46911ba68ecc364d7609f07a660d0983f78a2179 (patch)
treefa05b64b3551058732e6d7ba0feeac8117ff056e
parentb0c5d2c8b24e3ca46648cc0edbe2d924fd834210 (diff)
downloadkernel-46911ba68ecc364d7609f07a660d0983f78a2179.tar.gz
kernel-46911ba68ecc364d7609f07a660d0983f78a2179.tar.xz
kernel-46911ba68ecc364d7609f07a660d0983f78a2179.zip
Fix up merge issue with rxe.c
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
-rw-r--r--0001-Fix-up-a-merge-issue-with-rxe.c.patch31
-rw-r--r--kernel.spec2
2 files changed, 33 insertions, 0 deletions
diff --git a/0001-Fix-up-a-merge-issue-with-rxe.c.patch b/0001-Fix-up-a-merge-issue-with-rxe.c.patch
new file mode 100644
index 000000000..0d9cdd163
--- /dev/null
+++ b/0001-Fix-up-a-merge-issue-with-rxe.c.patch
@@ -0,0 +1,31 @@
+From 364788093bdf437c33753d327136c363be8f756c Mon Sep 17 00:00:00 2001
+From: "Justin M. Forbes" <jforbes@fedoraproject.org>
+Date: Mon, 26 Oct 2020 10:18:33 -0500
+Subject: [PATCH] Fix up a merge issue with rxe.c
+
+Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
+---
+ drivers/infiniband/sw/rxe/rxe.c | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/drivers/infiniband/sw/rxe/rxe.c b/drivers/infiniband/sw/rxe/rxe.c
+index 61725443c33b..faa8a6cadef1 100644
+--- a/drivers/infiniband/sw/rxe/rxe.c
++++ b/drivers/infiniband/sw/rxe/rxe.c
+@@ -286,13 +286,6 @@ static int __init rxe_module_init(void)
+
+ mark_tech_preview("Soft-RoCE Transport Driver", THIS_MODULE);
+
+- /* initialize slab caches for managed objects */
+- err = rxe_cache_init();
+- if (err) {
+- pr_err("unable to init object pools\n");
+- return err;
+- }
+-
+ err = rxe_net_init();
+ if (err)
+ return err;
+--
+2.28.0
+
diff --git a/kernel.spec b/kernel.spec
index ed74c4ea6..7f9c455fb 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -716,6 +716,7 @@ Source4000: README.rst
%if !%{nopatches}
Patch1: patch-%{rpmversion}-redhat.patch
+Patch2: 0001-Fix-up-a-merge-issue-with-rxe.c.patch
%endif
# empty final patch to facilitate testing of kernel patches
@@ -1219,6 +1220,7 @@ cp -a %{SOURCE1} .
%if !%{nopatches}
ApplyOptionalPatch patch-%{rpmversion}-redhat.patch
+ApplyOptionalPatch 0001-Fix-up-a-merge-issue-with-rxe.c.patch
%endif
ApplyOptionalPatch linux-kernel-test.patch