summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec12
1 files changed, 5 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec
index 0c87264..bd82e80 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -47,7 +47,7 @@ Summary: The Linux kernel
# reset this by hand to 1 (or to 0 and then use rpmdev-bumpspec).
# scripts/rebase.sh should be made to do that for you, actually.
#
-%global baserelease 173
+%global baserelease 174
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -61,7 +61,7 @@ Summary: The Linux kernel
# Do we have a -stable update to apply?
%define stable_update 26
# Is it a -stable RC?
-%define stable_rc 1
+%define stable_rc 0
# Set rpm version accordingly
%if 0%{?stable_update}
%define stablerev .%{stable_update}
@@ -830,9 +830,6 @@ Patch13030: l2tp-fix-oops-in-pppol2tp_xmit.patch
Patch14050: crypto-add-async-hash-testing.patch
-# Red Hat Bugzilla #610911
-Patch14130: kvm-mmu-fix-conflict-access-permissions-in-direct-sp.patch
-
Patch14200: net-do-not-check-capable-if-kernel.patch
# rhbz#596475
@@ -1534,8 +1531,6 @@ ApplyPatch l2tp-fix-oops-in-pppol2tp_xmit.patch
# add tests for crypto async hashing (#571577)
ApplyPatch crypto-add-async-hash-testing.patch
-#ApplyPatch kvm-mmu-fix-conflict-access-permissions-in-direct-sp.patch
-
# rhbz #598796
ApplyPatch net-do-not-check-capable-if-kernel.patch
@@ -2194,6 +2189,9 @@ fi
%kernel_variant_files -k vmlinux %{with_kdump} kdump
%changelog
+* Mon Nov 22 2010 Kyle McMartin <kyle@redhat.com> 2.6.32.26-174
+- Linux 2.6.32.26
+
* Sat Nov 20 2010 Chuck Ebbert <cebbert@redhat.com> 2.6.32.26-173.rc1
- Linux 2.6.32.26-rc1
- Comment out upstreamed patches: