[kernel/rawhide/user/kyle/kernel-36] Linux 2.6.36.3

Chuck Ebbert cebbert at fedoraproject.org
Mon Jan 10 14:04:11 UTC 2011


commit c62fd951a3a7c093a7d44363222d3691a251520b
Author: Chuck Ebbert <cebbert at redhat.com>
Date:   Mon Jan 10 09:02:47 2011 -0500

    Linux 2.6.36.3
    
    Drop merged patches:
      posix-cpu-timers-workaround-to-suppress-problems-with-mt-exec.patch
      sched-cure-more-NO_HZ-load-average-woes.patch
      orinoco-initialise-priv_hw-before-assigning-the-interrupt.patch

 .gitignore                                         |    1 -
 kernel.spec                                        |   26 +--
 ...se-priv_hw-before-assigning-the-interrupt.patch |   96 -------
 ...karound-to-suppress-problems-with-mt-exec.patch |   60 -----
 sched-cure-more-NO_HZ-load-average-woes.patch      |  273 --------------------
 sources                                            |    2 +-
 6 files changed, 10 insertions(+), 448 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b0922cf..c2fd413 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,3 @@ patch-*.bz2
 clog
 *.rpm
 kernel-2.6.*/
-/patch-2.6.36.2.bz2
diff --git a/kernel.spec b/kernel.spec
index cb071ef..f9e7b30 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -51,7 +51,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be prepended with "0.", so
 # for example a 3 here will become 0.3
 #
-%global baserelease 13
+%global baserelease 14
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -63,7 +63,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 2
+%define stable_update 3
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -730,8 +730,6 @@ Patch12308: fix-i8k-inline-asm.patch
 Patch12405: inet_diag-make-sure-we-run-the-same-bytecode-we-audited.patch
 Patch12408: netlink-make-nlmsg_find_attr-take-a-const-ptr.patch
 
-Patch12406: posix-cpu-timers-workaround-to-suppress-problems-with-mt-exec.patch
-
 Patch12410: tty-make-tiocgicount-a-handler.patch
 Patch12411: tty-icount-changeover-for-other-main-devices.patch
 
@@ -740,10 +738,6 @@ Patch12413: tpm-autodetect-itpm-devices.patch
 Patch12420: mm-page-allocator-adjust-the-per-cpu-counter-threshold-when-memory-is-low.patch
 Patch12421: mm-vmstat-use-a-single-setter-function-and-callback-for-adjusting-percpu-thresholds.patch
 
-Patch12430: sched-cure-more-NO_HZ-load-average-woes.patch
-
-Patch12431: orinoco-initialise-priv_hw-before-assigning-the-interrupt.patch
-
 Patch12435: btrfs-fix-error-handling-in-btrfs_get_sb.patch
 Patch12436: btrfs-fix-race-between-btrfs_get_sb-and-umount.patch
 Patch12437: btrfs-setup-blank-root-and-fs_info-for-mount-time.patch
@@ -1383,9 +1377,6 @@ ApplyPatch fix-i8k-inline-asm.patch
 ApplyPatch inet_diag-make-sure-we-run-the-same-bytecode-we-audited.patch
 ApplyPatch netlink-make-nlmsg_find_attr-take-a-const-ptr.patch
 
-# rhbz#656264
-ApplyPatch posix-cpu-timers-workaround-to-suppress-problems-with-mt-exec.patch
-
 # CVE-2010-4077, CVE-2010-4075 (rhbz#648660, #648663)
 ApplyPatch tty-make-tiocgicount-a-handler.patch
 ApplyPatch tty-icount-changeover-for-other-main-devices.patch
@@ -1396,12 +1387,6 @@ ApplyPatch tpm-autodetect-itpm-devices.patch
 ApplyPatch mm-page-allocator-adjust-the-per-cpu-counter-threshold-when-memory-is-low.patch
 ApplyPatch mm-vmstat-use-a-single-setter-function-and-callback-for-adjusting-percpu-thresholds.patch
 
-# rhbz#650934
-ApplyPatch sched-cure-more-NO_HZ-load-average-woes.patch
-
-# rhbz#657864 [229bd792]
-ApplyPatch orinoco-initialise-priv_hw-before-assigning-the-interrupt.patch
-
 # rhbz#637619
 ApplyPatch net-AF_PACKET-vmalloc.patch
 
@@ -2019,6 +2004,13 @@ fi
 #                 ||     ||
 
 %changelog
+* Mon Jan 10 2011 Chuck Ebbert <cebbert at redhat.com>  2.6.36.3-14
+- Linux 2.6.36.3
+- Drop merged patches:
+  posix-cpu-timers-workaround-to-suppress-problems-with-mt-exec.patch
+  sched-cure-more-NO_HZ-load-average-woes.patch
+  orinoco-initialise-priv_hw-before-assigning-the-interrupt.patch
+
 * Sat Dec 18 2010 Kyle McMartin <kyle at redhat.com>
 - Patch from nhorman against f13:
   Enhance AF_PACKET to allow non-contiguous buffer alloc (#637619)
diff --git a/sources b/sources
index 739824d..4224e77 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 61f3739a73afb6914cb007f37fb09b62  linux-2.6.36.tar.bz2
-4b01c5f9657a9587b262df5f8d784116  patch-2.6.36.2.bz2
+33f51375d4baa343502b39acf94d5a6c  patch-2.6.36.3.bz2


More information about the scm-commits mailing list