[kernel/f13/master] Linux 2.6.34.5

Chuck Ebbert cebbert at fedoraproject.org
Sat Aug 21 04:42:17 UTC 2010


commit c8ed7db337ae39cbd0879d51cea3803036c9ddc1
Author: Chuck Ebbert <cebbert at redhat.com>
Date:   Sat Aug 21 00:42:57 2010 -0400

    Linux 2.6.34.5
    
    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

 kernel.spec                                        |   15 ++--
 ...table-unmap-for-stack-guard-page-properly.patch |   71 ----------------
 ...r-visible-effects-of-the-stack-guard-page.patch |   85 --------------------
 sources                                            |    2 +-
 4 files changed, 8 insertions(+), 165 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 11aaa6a..3a5dbce 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -60,7 +60,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 4
+%define stable_update 5
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -764,9 +764,6 @@ Patch12440: direct-io-move-aio_complete-into-end_io.patch
 Patch12450: ext4-move-aio-completion-after-unwritten-extent-conversion.patch
 Patch12460: xfs-move-aio-completion-after-unwritten-extent-conversion.patch
 
-Patch12470: mm-fix-page-table-unmap-for-stack-guard-page-properly.patch
-Patch12480: mm-fix-up-some-user-visible-effects-of-the-stack-guard-page.patch
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1422,10 +1419,6 @@ ApplyPatch direct-io-move-aio_complete-into-end_io.patch
 ApplyPatch ext4-move-aio-completion-after-unwritten-extent-conversion.patch
 ApplyPatch xfs-move-aio-completion-after-unwritten-extent-conversion.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
@@ -2047,6 +2040,12 @@ fi
 
 
 %changelog
+* Sat Aug 21 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.34.5-43
+- Linux 2.6.34.5
+- 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 at redhat.com>
 - Restore linux-2.6-umh-refactor.patch, still needed in 2.6.34 (#625150)
 - Drop coredump-uid-pipe-check.patch, now upstream.
diff --git a/sources b/sources
index 2504334..1da88d3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 10eebcb0178fb4540e2165bfd7efc7ad  linux-2.6.34.tar.bz2
-158f4c022c3fecff98c329b6dc49e3b6  patch-2.6.34.4.bz2
+8a4d2f75b2e09edb20de304c4f2240f6  patch-2.6.34.5.bz2


More information about the scm-commits mailing list