[kernel/f15/master] Drop unused patches already applied upstream

Chuck Ebbert cebbert at fedoraproject.org
Fri Mar 25 21:53:05 UTC 2011


commit 535b4d942d610b2bbd5ec93c7441c0ca50ad06df
Author: Chuck Ebbert <cebbert at redhat.com>
Date:   Fri Mar 25 17:54:00 2011 -0400

    Drop unused patches already applied upstream

 hdpvr-ir-enable.patch             |  229 -------------------------------------
 kernel.spec                       |    9 +-
 thinkpad-acpi-fix-backlight.patch |   56 ---------
 3 files changed, 3 insertions(+), 291 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 1a35832..d82cccb 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -646,7 +646,6 @@ Patch399: acpi_battery-fribble-sysfs-files-from-a-resume-notifier.patch
 
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch452: linux-2.6.30-no-pcspkr-modalias.patch
-Patch454: thinkpad-acpi-fix-backlight.patch
 
 Patch460: linux-2.6-serial-460800.patch
 
@@ -702,7 +701,6 @@ Patch2910: linux-2.6-v4l-dvb-add-lgdt3304-support.patch
 Patch2912: linux-2.6-v4l-dvb-ir-core-update.patch
 
 #Patch2916: lirc-staging-2.6.36-fixes.patch
-#Patch2917: hdpvr-ir-enable.patch
 
 Patch2918: flexcop-fix-xlate_proc_name-warning.patch
 
@@ -1274,8 +1272,6 @@ ApplyPatch die-floppy-die.patch
 
 ApplyPatch linux-2.6.30-no-pcspkr-modalias.patch
 
-#ApplyPatch thinkpad-acpi-fix-backlight.patch
-
 # Allow to use 480600 baud on 16C950 UARTs
 ApplyPatch linux-2.6-serial-460800.patch
 
@@ -1340,8 +1336,6 @@ ApplyOptionalPatch linux-2.6-v4l-dvb-experimental.patch
 
 # http://www.lirc.org/
 #ApplyOptionalPatch lirc-staging-2.6.36-fixes.patch
-# enable IR receiver on Hauppauge HD PVR (v4l-dvb merge pending)
-#ApplyPatch hdpvr-ir-enable.patch
 
 # rhbz#664852
 ApplyPatch flexcop-fix-xlate_proc_name-warning.patch
@@ -1988,6 +1982,9 @@ fi
 %changelog
 * Fri Mar 25 2011 Chuck Ebbert <cebbert at redhat.com>
 - CVE-2011-1182: kernel signal spoofing issue
+- Drop unused patches already applied upstream:
+  hdpvr-ir-enable.patch
+  thinkpad-acpi-fix-backlight.patch
 
 * Wed Mar 23 2011 Chuck Ebbert <cebbert at redhat.com> 2.6.38.1-6
 - Linux 2.6.38.1


More information about the scm-commits mailing list