summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorKyle McMartin <kyle@mcmartin.ca>2010-11-02 13:06:42 -0400
committerKyle McMartin <kyle@mcmartin.ca>2010-11-02 13:06:42 -0400
commit7b2f649ec2da6640878c15298f5d3f8451dd8125 (patch)
treeb26440ffa8853847fa0625f932673c7ff2554f2c /kernel.spec
parent3daa57b3d93c5d0a795e3446850c83483df37f2e (diff)
downloadkernel-7b2f649ec2da6640878c15298f5d3f8451dd8125.tar.gz
kernel-7b2f649ec2da6640878c15298f5d3f8451dd8125.tar.xz
kernel-7b2f649ec2da6640878c15298f5d3f8451dd8125.zip
Linux 2.6.37-rc1
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec24
1 files changed, 7 insertions, 17 deletions
diff --git a/kernel.spec b/kernel.spec
index e8a00a281..f8c30f610 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -82,9 +82,9 @@ Summary: The Linux kernel
# The next upstream release sublevel (base_sublevel+1)
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
# The rc snapshot level
-%define rcrev 0
+%define rcrev 1
# The git snapshot level
-%define gitrev 8
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -698,15 +698,10 @@ Patch12030: tpm-fix-stall-on-boot.patch
# Runtime power management
Patch12200: linux-2.6-bluetooth-autosuspend.patch
-Patch12201: linux-2.6-uvc-autosuspend.patch
Patch12203: linux-2.6-usb-pci-autosuspend.patch
Patch12204: linux-2.6-enable-more-pci-autosuspend.patch
Patch12205: runtime_pm_fixups.patch
-Patch12225: pci-crs-fixes.patch
-
-Patch12302: pnpacpi-cope-with-invalid-device-ids.patch
-
Patch12303: dmar-disable-when-ricoh-multifunction.patch
%endif
@@ -1127,7 +1122,7 @@ ApplyPatch linux-2.6-hotfixes.patch
# Roland's utrace ptrace replacement.
ApplyPatch linux-2.6-tracehook.patch
ApplyPatch linux-2.6-utrace.patch
-ApplyPatch linux-2.6-utrace-ptrace.patch
+#ApplyPatch linux-2.6-utrace-ptrace.patch
# Architecture patches
# x86(-64)
@@ -1193,7 +1188,7 @@ ApplyPatch linux-2.6-defaults-pci_use_crs.patch
# enable ASPM by default on hardware we expect to work
ApplyPatch linux-2.6-defaults-aspm.patch
-ApplyPatch ima-allow-it-to-be-completely-disabled-and-default-off.patch
+#ApplyPatch ima-allow-it-to-be-completely-disabled-and-default-off.patch
#
# SCSI Bits.
@@ -1291,18 +1286,10 @@ ApplyPatch tpm-fix-stall-on-boot.patch
# Runtime PM
ApplyPatch linux-2.6-bluetooth-autosuspend.patch
-ApplyPatch linux-2.6-uvc-autosuspend.patch
ApplyPatch linux-2.6-usb-pci-autosuspend.patch
ApplyPatch linux-2.6-enable-more-pci-autosuspend.patch
ApplyPatch runtime_pm_fixups.patch
-# PCI patches to fix problems with _CRS
-# ( from linux-pci list )
-ApplyPatch pci-crs-fixes.patch
-
-# rhbz#641468
-ApplyPatch pnpacpi-cope-with-invalid-device-ids.patch
-
# rhbz#605888
ApplyPatch dmar-disable-when-ricoh-multifunction.patch
@@ -1913,6 +1900,9 @@ fi
# || ||
%changelog
+* Tue Nov 02 2010 Kyle McMartin <kyle@redhat.com> 2.6.37-0.1.rc1.git0
+- Linux 2.6.37-rc1
+
* Tue Oct 26 2010 Kyle McMartin <kyle@redhat.com> 2.6.37-0.1.rc0.git8
- Linux 2.6.36-git8