summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec2
1 files changed, 2 insertions, 0 deletions
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