diff options
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kernel.spec b/kernel.spec index 406a56e..43f977f 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 163 +%global baserelease 164 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -59,7 +59,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 19 +%define stable_update 20 # Is it a -stable RC? %define stable_rc 0 # Set rpm version accordingly @@ -840,8 +840,6 @@ Patch14130: kvm-mmu-fix-conflict-access-permissions-in-direct-sp.patch Patch14140: hid-01-usbhid-initialize-interface-pointers-early-enough.patch Patch14141: hid-02-fix-suspend-crash-by-moving-initializations-earlier.patch -Patch14150: mm-fix-page-table-unmap-for-stack-guard-page-properly.patch -Patch14160: mm-fix-up-some-user-visible-effects-of-the-stack-guard-page.patch # ============================================================================== %endif @@ -1552,10 +1550,6 @@ ApplyPatch kvm-mmu-fix-conflict-access-permissions-in-direct-sp.patch ApplyPatch hid-01-usbhid-initialize-interface-pointers-early-enough.patch ApplyPatch hid-02-fix-suspend-crash-by-moving-initializations-earlier.patch -# Fix fallout from stack guard page -ApplyPatch mm-fix-page-table-unmap-for-stack-guard-page-properly.patch -ApplyPatch mm-fix-up-some-user-visible-effects-of-the-stack-guard-page.patch - # END OF PATCH APPLICATIONS ==================================================== %endif @@ -2208,6 +2202,12 @@ fi %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Sat Aug 21 2010 Chuck Ebbert <cebbert@redhat.com> 2.6.32.20-164 +- Linux 2.6.32.20 +- Drop merged patches: + mm-fix-page-table-unmap-for-stack-guard-page-properly.patch + mm-fix-up-some-user-visible-effects-of-the-stack-guard-page.patch + * Wed Aug 18 2010 Chuck Ebbert <cebbert@redhat.com> 2.6.32.19-163 - Bump version. |