Linux 2.6.32.26-rc1

Comment out upstreamed patches:
kvm-mmu-fix-conflict-access-permissions-in-direct-sp.patch
This commit is contained in:
Chuck Ebbert 2010-11-20 09:22:42 -05:00
parent 34ce4d0bf8
commit 1edacad74d
2 changed files with 10 additions and 4 deletions

View File

@ -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 172
%global baserelease 173
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@ -59,9 +59,9 @@ Summary: The Linux kernel
%if 0%{?released_kernel}
# Do we have a -stable update to apply?
%define stable_update 25
%define stable_update 26
# Is it a -stable RC?
%define stable_rc 0
%define stable_rc 1
# Set rpm version accordingly
%if 0%{?stable_update}
%define stablerev .%{stable_update}
@ -1534,7 +1534,7 @@ 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
#ApplyPatch kvm-mmu-fix-conflict-access-permissions-in-direct-sp.patch
# rhbz #598796
ApplyPatch net-do-not-check-capable-if-kernel.patch
@ -2194,6 +2194,11 @@ fi
%kernel_variant_files -k vmlinux %{with_kdump} kdump
%changelog
* 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:
kvm-mmu-fix-conflict-access-permissions-in-direct-sp.patch
* Fri Oct 29 2010 Chuck Ebbert <cebbert@redhat.com> 2.6.32.25-172
- Linux 2.6.32.25

View File

@ -1,2 +1,3 @@
260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2
d8fff54efff6c5f7b07e5370a5e9f119 patch-2.6.32.25.bz2
02f9952773a1d550d17d76d845ccd404 patch-2.6.32.26-rc1.bz2