diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-10-26 10:21:26 -0500 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-10-26 10:21:26 -0500 |
| commit | 46911ba68ecc364d7609f07a660d0983f78a2179 (patch) | |
| tree | fa05b64b3551058732e6d7ba0feeac8117ff056e /kernel.spec | |
| parent | b0c5d2c8b24e3ca46648cc0edbe2d924fd834210 (diff) | |
| download | kernel-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>
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 2 |
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 |