summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-12-09 05:43:21 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2020-12-09 05:43:21 +0100
commitb44b2ecbe7de047c288fd5f1877e36e35a5abff7 (patch)
treec941845b0105f3daaa9da7c1fdbd9468e982ac6a /kernel.spec
parent7fb85acaeb2892e1d784882cf437a8d00ebc2b81 (diff)
parentc1c209984bdadb6d1f0212786f8e244c15708b74 (diff)
downloadkernel-b44b2ecbe7de047c288fd5f1877e36e35a5abff7.tar.gz
kernel-b44b2ecbe7de047c288fd5f1877e36e35a5abff7.tar.xz
kernel-b44b2ecbe7de047c288fd5f1877e36e35a5abff7.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
-rwxr-xr-xkernel.spec2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index 0cd2c9d4a..41367c47d 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -742,6 +742,7 @@ Source4000: README.rst
%if !%{nopatches}
Patch1: patch-%{rpmversion}-redhat.patch
+Patch2: revert-mm-filemap-add-static-for-function-__add_to_page_cache_locked.patch
%endif
# empty final patch to facilitate testing of kernel patches
@@ -1245,6 +1246,7 @@ cd linux-%{KVERREL}
%if !%{nopatches}
ApplyOptionalPatch patch-%{rpmversion}-redhat.patch
+ApplyOptionalPatch revert-mm-filemap-add-static-for-function-__add_to_page_cache_locked.patch
%endif
ApplyOptionalPatch linux-kernel-test.patch