summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-12-08 10:14:55 -0500
committerJosh Boyer <jwboyer@redhat.com>2011-12-08 10:14:55 -0500
commit9f7d284a10af2b8d633628b57781b58f43cb0766 (patch)
treee0c132ad202b58ded088584f3c0b4e74d010f6c4 /kernel.spec
parente29397a0ab3fac4a32e8f51a92cff8ff108a77c2 (diff)
downloadkernel-9f7d284a10af2b8d633628b57781b58f43cb0766.tar.gz
kernel-9f7d284a10af2b8d633628b57781b58f43cb0766.tar.xz
kernel-9f7d284a10af2b8d633628b57781b58f43cb0766.zip
Add patch from Jeff Layton to fix suspend with NFS (rhbz #717735)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec11
1 files changed, 10 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index 0099e9e6d..57a348e44 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 1
+%global baserelease 2
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -731,6 +731,9 @@ Patch21030: alps.patch
# rhbz 736815
Patch21040: x86-code-dump-fix-truncation.patch
+#rhbz 717735
+Patch21045: nfs-client-freezer.patch
+
# compat-wireless patches
Patch50000: compat-wireless-config-fixups.patch
Patch50001: compat-add-module_usb_driver-and-module_platform_driver.patch
@@ -1411,6 +1414,9 @@ ApplyPatch alps.patch
# rhbz 736815
ApplyPatch x86-code-dump-fix-truncation.patch
+#rhbz 717735
+ApplyPatch nfs-client-freezer.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2219,6 +2225,9 @@ fi
# ||----w |
# || ||
%changelog
+* Thu Dec 08 2011 Josh Boyer <jwboyer@redhat.com>
+- Add patch from Jeff Layton to fix suspend with NFS (rhbz #717735)
+
* Wed Dec 07 2011 Dave Jones <davej@redhat.com> - 3.2.0-0.rc4.git5.2
- Linux 3.2-rc4-git5 (77a7300abad7fe01891b400e88d746f97307ee5a)