summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
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 5343092c1..1f3d87312 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 3
+%global baserelease 4
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -751,6 +751,8 @@ Patch21045: nfs-client-freezer.patch
#rhbz 770233
Patch21065: Bluetooth-Add-support-for-BCM20702A0-0a5c-21e3.patch
+Patch21070: ext4-Support-check-none-nocheck-mount-options.patch
+
# compat-wireless patches
Patch50000: compat-wireless-config-fixups.patch
Patch50001: compat-wireless-pr_fmt-warning-avoidance.patch
@@ -1455,6 +1457,8 @@ ApplyPatch nfs-client-freezer.patch
#rhbz 770233
ApplyPatch Bluetooth-Add-support-for-BCM20702A0-0a5c-21e3.patch
+ApplyPatch ext4-Support-check-none-nocheck-mount-options.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2289,6 +2293,9 @@ fi
# ||----w |
# || ||
%changelog
+* Tue Jan 10 2012 Josh Boyer <jwboyer@redhat.com>
+- Add patch to fix ext4 compatibility with ext2 mount option (rhbz 770172)
+
* Thu Jan 05 2012 Adam Jackson <ajax@redhat.com>
- Disable unsupported DRI1-only DRM drivers: i810, r128, tdfx