[kernel/f12/master] Linux 2.6.32.25

Chuck Ebbert cebbert at fedoraproject.org
Fri Oct 29 15:52:26 UTC 2010


commit 34ce4d0bf81d20712a271b453b4719d3c3f3c1df
Author: Chuck Ebbert <cebbert at redhat.com>
Date:   Fri Oct 29 11:50:03 2010 -0400

    Linux 2.6.32.25

 ...mprove-interactivity-with-large-arguments.patch |   36 ----
 ...esponsive-to-sigkill-with-large-arguments.patch |   51 -----
 kernel.spec                                        |   34 +---
 r8169-fix-dma-allocations.patch                    |  199 --------------------
 ...rg_pages-diagnose-excessive-argument-size.patch |   42 ----
 skge-quirk-to-4gb-dma.patch                        |   70 -------
 sources                                            |    3 +-
 xen-fix-typo-in-xen-irq-fix.patch                  |   13 --
 8 files changed, 6 insertions(+), 442 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 9bbccfc..0ef8362 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 171
+%global baserelease 172
 %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 25
 # 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}
@@ -835,19 +835,6 @@ Patch14130: kvm-mmu-fix-conflict-access-permissions-in-direct-sp.patch
 
 Patch14200: net-do-not-check-capable-if-kernel.patch
 
-# Mitigate DOS with large argument lists
-Patch14210: execve-improve-interactivity-with-large-arguments.patch
-Patch14211: execve-make-responsive-to-sigkill-with-large-arguments.patch
-Patch14212: setup_arg_pages-diagnose-excessive-argument-size.patch
-
-Patch14220: xen-fix-typo-in-xen-irq-fix.patch
-
-# rhbz#447489
-Patch14224: skge-quirk-to-4gb-dma.patch
-
-# rhbz#629158
-Patch14225: r8169-fix-dma-allocations.patch
-
 # rhbz#596475
 Patch14226: add-support-for-ricoh-e822-sdhci.patch
 
@@ -1552,20 +1539,6 @@ ApplyPatch kvm-mmu-fix-conflict-access-permissions-in-direct-sp.patch
 # rhbz #598796
 ApplyPatch net-do-not-check-capable-if-kernel.patch
 
-# Mitigate DOS with large argument lists
-#ApplyPatch execve-improve-interactivity-with-large-arguments.patch
-#ApplyPatch execve-make-responsive-to-sigkill-with-large-arguments.patch
-#ApplyPatch setup_arg_pages-diagnose-excessive-argument-size.patch
-
-# Fix typo in Xen patch from 2.6.22 that causes hang on boot.
-#ApplyPatch xen-fix-typo-in-xen-irq-fix.patch
-
-# rhbz#629158
-#ApplyPatch r8169-fix-dma-allocations.patch
-
-# rhbz#447489
-#ApplyPatch skge-quirk-to-4gb-dma.patch
-
 # rhbz#596475
 ApplyPatch add-support-for-ricoh-e822-sdhci.patch
 
@@ -2221,6 +2194,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Oct 29 2010 Chuck Ebbert <cebbert at redhat.com> 2.6.32.25-172
+- Linux 2.6.32.25
+
 * Fri Oct 22 2010 Chuck Ebbert <cebbert at redhat.com> 2.6.32.25-171.rc1
 - Linux 2.6.32.25-rc1
 - Comment out patches merged upstream:
diff --git a/sources b/sources
index fec6be1..c0a59b1 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
 260551284ac224c3a43c4adac7df4879  linux-2.6.32.tar.bz2
-e3346e3b4b92f048b8ecded829f45cdf  patch-2.6.32.24.bz2
-811287361e4449aaad026b1c2df79d63  patch-2.6.32.25-rc1.bz2
+d8fff54efff6c5f7b07e5370a5e9f119  patch-2.6.32.25.bz2


More information about the scm-commits mailing list