[kernel/f16] spec cleanup: drop commented out patches

Josh Boyer jwboyer at fedoraproject.org
Fri Dec 9 21:33:29 UTC 2011


commit 260881f05b0ec12518d87530f52f064a60dffff5
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Fri Dec 9 16:31:35 2011 -0500

    spec cleanup: drop commented out patches

 kernel.spec                                        |   12 +-
 rtlwifi-fix-lps_lock-deadlock.patch                |  224 --------------------
 ...ossible-memory-corruption-in-xfs_readlink.patch |   77 -------
 3 files changed, 1 insertions(+), 312 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 55627e7..4357972 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 1
+%global baserelease 2
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -770,9 +770,6 @@ Patch21022: mm-do-not-stall-in-synchronous-compaction-for-THP-allocations.patch
 Patch21030: be2net-non-member-vlan-pkts-not-received-in-promisco.patch
 Patch21031: benet-remove-bogus-unlikely-on-vlan-check.patch
 
-#rhbz 749166
-Patch21050: xfs-Fix-possible-memory-corruption-in-xfs_readlink.patch
-
 Patch21070: oom-fix-integer-overflow-of-points.patch
 
 #rhbz 728607
@@ -792,9 +789,6 @@ Patch21091: bcma-brcmsmac-compat.patch
 Patch21100: cciss-fix-irqf-shared.patch
 Patch21101: hpsa-add-irqf-shared.patch
 
-#rhbz 755154
-Patch21200: rtlwifi-fix-lps_lock-deadlock.patch
-
 #rhbz 731365
 Patch21220: mac80211_offchannel_rework_revert.patch
 
@@ -1305,7 +1299,6 @@ ApplyPatch linux-2.6-i386-nx-emulation.patch
 ApplyPatch jbd-jbd2-validate-sb-s_first-in-journal_get_superblo.patch
 
 # xfs
-#ApplyPatch xfs-Fix-possible-memory-corruption-in-xfs_readlink.patch
 
 # btrfs
 
@@ -1464,9 +1457,6 @@ ApplyPatch bcma-brcmsmac-compat.patch
 ApplyPatch cciss-fix-irqf-shared.patch
 ApplyPatch hpsa-add-irqf-shared.patch
 
-#rhbz 755154
-#ApplyPatch rtlwifi-fix-lps_lock-deadlock.patch
-
 #rhbz 731365
 ApplyPatch mac80211_offchannel_rework_revert.patch
 


More information about the scm-commits mailing list