From 46911ba68ecc364d7609f07a660d0983f78a2179 Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Mon, 26 Oct 2020 10:21:26 -0500
Subject: Fix up merge issue with rxe.c

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
---
 kernel.spec | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'kernel.spec')

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
-- 
cgit