summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-05-31 12:13:21 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-05-31 12:13:21 -0400
commit2a0a85581b09ceaa23099161c55b1e3b1e963139 (patch)
tree95f321c3823b9fe49c0da46838d0b9f9752100e5 /kernel.spec
parentf2b63222ef5de8f44d8d63e6be0d6d22a92216ae (diff)
downloadkernel-2a0a85581b09ceaa23099161c55b1e3b1e963139.tar.gz
kernel-2a0a85581b09ceaa23099161c55b1e3b1e963139.tar.xz
kernel-2a0a85581b09ceaa23099161c55b1e3b1e963139.zip
Add patch to fix dentry lockdep splat
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec9
1 files changed, 8 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index 2dd8f7454..77ac0d6ed 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -40,7 +40,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 1
+%global baserelease 2
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -641,6 +641,8 @@ Patch25071: s390-appldata-add-slab.h-for-kzalloc-kfree.patch
# CVE-2014-3917 rhbz 1102571 1102715
Patch25093: auditsc-audit_krule-mask-accesses-need-bounds-checking.patch
+Patch25094: dentry-d_lockref-fix.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -1358,6 +1360,8 @@ ApplyPatch s390-appldata-add-slab.h-for-kzalloc-kfree.patch
# CVE-2014-3917 rhbz 1102571 1102715
ApplyPatch auditsc-audit_krule-mask-accesses-need-bounds-checking.patch
+ApplyPatch dentry-d_lockref-fix.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2228,6 +2232,9 @@ fi
# ||----w |
# || ||
%changelog
+* Sat May 31 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.15.0-0.rc7.git4.2
+- Add patch to fix dentry lockdep splat
+
* Sat May 31 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.15.0-0.rc7.git4.1
- Linux v3.15-rc7-102-g1487385edb55