summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2012-02-20 13:40:26 -0500
committerDave Jones <davej@redhat.com>2012-02-20 13:40:26 -0500
commite9f72477ec5bc201b8c3f4ec81689a8f67cfcc19 (patch)
tree10c443648415fd27616730d15b54811aa23ae1a8 /kernel.spec
parentcd70fad7efdfdf12088efc10d80c35a8f759b524 (diff)
downloadkernel-e9f72477ec5bc201b8c3f4ec81689a8f67cfcc19.tar.gz
kernel-e9f72477ec5bc201b8c3f4ec81689a8f67cfcc19.tar.xz
kernel-e9f72477ec5bc201b8c3f4ec81689a8f67cfcc19.zip
NFSv4: Fix an Oops in the NFSv4 getacl code
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 9d67c935c..dbe3b2d8d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,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 2
+%global baserelease 3
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -734,6 +734,8 @@ Patch14000: hibernate-freeze-filesystems.patch
Patch14010: lis3-improve-handling-of-null-rate.patch
+Patch14020: nfs-oops-getacl.patch
+
Patch20000: utrace.patch
# Flattened devicetree support
@@ -1455,6 +1457,8 @@ ApplyPatch hibernate-freeze-filesystems.patch
ApplyPatch lis3-improve-handling-of-null-rate.patch
+ApplyPatch nfs-oops-getacl.patch
+
# utrace.
ApplyPatch utrace.patch
@@ -2366,6 +2370,9 @@ fi
# ||----w |
# || ||
%changelog
+* Mon Feb 20 2012 Dave Jones <davej@redhat.com>
+- NFSv4: Fix an Oops in the NFSv4 getacl code
+
* Mon Feb 20 2012 Josh Boyer <jwboyer@gmail.com> - 3.3.0-0.rc4.git0.2
- Reenable debugging options.