[kernel/f15/master] drop unneeded patch

Kyle McMartin kyle at fedoraproject.org
Fri Apr 15 14:52:13 UTC 2011


commit 36477ddc42a12a82cf35088698e4457ea658f628
Author: Kyle McMartin <kyle at redhat.com>
Date:   Fri Apr 15 10:52:11 2011 -0400

    drop unneeded patch

 kernel.spec                                        |    9 ++--
 ...e-initialize-mmu_cr4_features-during-boot.patch |   46 --------------------
 2 files changed, 4 insertions(+), 51 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 6d2060b..e1a08c5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -733,8 +733,6 @@ Patch12303: dmar-disable-when-ricoh-multifunction.patch
 Patch12305: printk-do-not-mangle-valid-userspace-syslog-prefixes.patch
 Patch12306: scsi-sd-downgrade-caching-printk-from-error-to-notice.patch
 
-Patch12307: x86-hibernate-initialize-mmu_cr4_features-during-boot.patch
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1363,9 +1361,6 @@ ApplyPatch printk-do-not-mangle-valid-userspace-syslog-prefixes.patch
 
 ApplyPatch scsi-sd-downgrade-caching-printk-from-error-to-notice.patch
 
-# fix hibernate broken by 2.6.38.y
-ApplyPatch x86-hibernate-initialize-mmu_cr4_features-during-boot.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1974,6 +1969,10 @@ fi
 # and build.
 
 %changelog
+* Fri Apr 15 2011 Kyle McMartin <kmcmartin at redhat.com>
+- Drop x86-hibernate-initialize-mmu_cr4_features-during-boot.patch, 
+  e5f15b45 was reverted in stable.
+
 * Thu Apr 14 2011 Chuck Ebbert <cebbert at redhat.com> 2.6.38.3-16
 - Linux 2.6.38.3
 - Drop merged patches:


More information about the scm-commits mailing list