rpms/kernel/devel kernel.spec, 1.1152, 1.1153 linux-2.6-crypto-fips_enable.patch, 1.1, NONE linux-2.6-sched-features-disable-hrtick.patch, 1.1, NONE linux-2.6-sched_clock-prevent-scd-clock-from-moving-backwards, 1.1, NONE linux-2.6-usb-ehci-hcd-respect-nousb.patch, 1.2, NONE linux-2.6-usb-storage-unusual-devs-jmicron-ata-bridge.patch, 1.1, NONE linux-2.6-x86-avoid-dereferencing-beyond-stack-THREAD_SIZE.patch, 1.1, NONE

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23285

Modified Files:
	kernel.spec 
Removed Files:
	linux-2.6-crypto-fips_enable.patch 
	linux-2.6-sched-features-disable-hrtick.patch 
	linux-2.6-sched_clock-prevent-scd-clock-from-moving-backwards 
	linux-2.6-usb-ehci-hcd-respect-nousb.patch 
	linux-2.6-usb-storage-unusual-devs-jmicron-ata-bridge.patch 
	linux-2.6-x86-avoid-dereferencing-beyond-stack-THREAD_SIZE.patch 
Log Message:
* Mon Dec 08 2008 Kyle McMartin <kyle at redhat.com>
- merging, merging, merging...



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1152
retrieving revision 1.1153
diff -u -r1.1152 -r1.1153
--- kernel.spec	8 Dec 2008 15:39:52 -0000	1.1152
+++ kernel.spec	8 Dec 2008 16:02:11 -0000	1.1153
@@ -589,9 +589,6 @@
 Patch41: linux-2.6-sysrq-c.patch
 Patch44: linux-2.6-x86-avoid-dereferencing-beyond-stack-THREAD_SIZE.patch
 
-Patch60: linux-2.6-sched-features-disable-hrtick.patch
-Patch61: linux-2.6-sched_clock-prevent-scd-clock-from-moving-backwards
-
 Patch140: linux-2.6-ps3-ehci-iso.patch
 Patch141: linux-2.6-ps3-storage-alias.patch
 Patch142: linux-2.6-ps3-legacy-bootloader-hack.patch
@@ -689,13 +686,6 @@
 Patch2200: linux-2.6-firewire-git-update.patch
 Patch2201: linux-2.6-firewire-git-pending.patch
 
-# make USB EHCI driver respect "nousb" parameter
-Patch2300: linux-2.6-usb-ehci-hcd-respect-nousb.patch
-Patch2301: linux-2.6-usb-storage-unusual-devs-jmicron-ata-bridge.patch
-
-# Add fips_enable flag
-Patch2400: linux-2.6-crypto-fips_enable.patch
-
 # get rid of imacfb and make efifb work everywhere it was used
 Patch2600: linux-2.6-merge-efifb-imacfb.patch
 
@@ -1094,19 +1084,12 @@
 # Roland's utrace ptrace replacement.
 ApplyPatch linux-2.6-utrace.patch
 
-ApplyPatch linux-2.6-x86-mtrr-kill-bogus-warning.patch
-
 # enable sysrq-c on all kernels, not only kexec
 ApplyPatch linux-2.6-sysrq-c.patch
 
-# scheduler
-#ApplyPatch linux-2.6-sched-features-disable-hrtick.patch
-#ApplyPatch linux-2.6-sched_clock-prevent-scd-clock-from-moving-backwards
-
 # Architecture patches
 # x86(-64)
-# don't oops in get_wchan()
-#ApplyPatch linux-2.6-x86-avoid-dereferencing-beyond-stack-THREAD_SIZE.patch
+ApplyPatch linux-2.6-x86-mtrr-kill-bogus-warning.patch
 
 #
 # PowerPC
@@ -1142,22 +1125,11 @@
 # bugfixes to drivers and filesystems
 #
 
-# ext4/jbd changes up to 2.6.28-rc3-git6
-#ApplyPatch linux-2.6.27-ext4-2.6.28-rc3-git6.patch
-# Fixups for the upstream ext4 code to build cleanly in 2.6.27.
-#ApplyPatch linux-2.6.27-ext4-2.6.28-backport-fixups.patch
-# CVE-2008-3528, ext-fs dir corruption
-#ApplyPatch linux-2.6.27-ext-dir-corruption-fix.patch
+# ext4
 
 # xfs
 
 # USB
-#ApplyPatch linux-2.6-usb-ehci-hcd-respect-nousb.patch
-# fix I/O errors on jmicron usb-ata bridge
-#ApplyPatch linux-2.6-usb-storage-unusual-devs-jmicron-ata-bridge.patch
-
-# Add the ability to turn FIPS-compliant mode on or off at boot
-#ApplyPatch linux-2.6-crypto-fips_enable.patch
 
 # ACPI
 


--- linux-2.6-crypto-fips_enable.patch DELETED ---


--- linux-2.6-sched-features-disable-hrtick.patch DELETED ---


--- linux-2.6-sched_clock-prevent-scd-clock-from-moving-backwards DELETED ---


--- linux-2.6-usb-ehci-hcd-respect-nousb.patch DELETED ---


--- linux-2.6-usb-storage-unusual-devs-jmicron-ata-bridge.patch DELETED ---


--- linux-2.6-x86-avoid-dereferencing-beyond-stack-THREAD_SIZE.patch DELETED ---