[kernel] Update to upstream HEAD (v3.1-rc10-42-g2efd7c0).

Chuck Ebbert cebbert at fedoraproject.org
Sat Oct 22 00:01:49 UTC 2011


commit 65b0d9b17d6f4e29af727394aad61b52699bbe54
Author: Chuck Ebbert <cebbert at redhat.com>
Date:   Fri Oct 21 20:01:25 2011 -0400

    Update to upstream HEAD (v3.1-rc10-42-g2efd7c0).

 cputimer-cure-lock-inversion.patch |   73 ------------------------------------
 kernel.spec                        |   11 +----
 sources                            |    1 +
 3 files changed, 4 insertions(+), 81 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 44d71c1..093f931 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -84,7 +84,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 10
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -749,9 +749,6 @@ Patch21002: mmc-Always-check-for-lower-base-frequency-quirk-for-.patch
 Patch21020: 0001-mm-vmscan-Limit-direct-reclaim-for-higher-order-allo.patch
 Patch21021: 0002-mm-Abort-reclaim-compaction-if-compaction-can-procee.patch
 
-# rhbz #746485
-Patch21030: cputimer-cure-lock-inversion.patch
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1379,9 +1376,6 @@ ApplyPatch utrace.patch
 ApplyPatch 0001-mm-vmscan-Limit-direct-reclaim-for-higher-order-allo.patch
 ApplyPatch 0002-mm-Abort-reclaim-compaction-if-compaction-can-procee.patch
 
-# rhbz #746485
-ApplyPatch cputimer-cure-lock-inversion.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2090,8 +2084,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
-* Fri Oct 21 2011 Chuck Ebbert <cebbert at redhat.com>
+* Fri Oct 21 2011 Chuck Ebbert <cebbert at redhat.com> 3.1.0-0.rc10.git1.1
 - Require grubby >= 8.3-1 like F16 does.
+- Update to upstream HEAD (v3.1-rc10-42-g2efd7c0).
 
 * Fri Oct 21 2011 Dave Jones <davej at redhat.com>
 - Lower severity of Radeon lockup messages.
diff --git a/sources b/sources
index b3a7cb2..7924e60 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 398e95866794def22b12dfbc15ce89c0  linux-3.0.tar.bz2
 6a91efe6505579a181c5f5e1a68f6c3a  patch-3.1-rc10.bz2
+aaf9baa66a0fde2b3824ab618ac1be6c  patch-3.1-rc10-git1.bz2


More information about the scm-commits mailing list