diff options
| author | Kyle McMartin <kyle@dreadnought.i.jkkm.org> | 2010-10-14 11:41:08 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@dreadnought.i.jkkm.org> | 2010-10-14 11:41:08 -0400 |
| commit | d0022418691bf7e9760d9be955a4b6c27a5ea16e (patch) | |
| tree | 877da5d41d4389282e3e403c54461728d78dcb8e | |
| parent | 20eeae5898937899366d5e243868fa0cfe131bfc (diff) | |
| download | kernel-d0022418691bf7e9760d9be955a4b6c27a5ea16e.tar.gz kernel-d0022418691bf7e9760d9be955a4b6c27a5ea16e.tar.xz kernel-d0022418691bf7e9760d9be955a4b6c27a5ea16e.zip | |
Linux 2.6.36-rc7-git5, disable runtime PM for now
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | kernel.spec | 17 | ||||
| -rw-r--r-- | sources | 2 |
3 files changed, 13 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore index aac9429ab..235a48d8d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,4 @@ clog *.rpm kernel-2.6.*/ /patch-2.6.36-rc7.bz2 -/patch-2.6.36-rc7-git3.bz2 +/patch-2.6.36-rc7-git5.bz2 diff --git a/kernel.spec b/kernel.spec index 5c156822d..825a81d4f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -51,7 +51,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be prepended with "0.", so # for example a 3 here will become 0.3 # -%global baserelease 36 +%global baserelease 37 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -1316,11 +1316,12 @@ ApplyPatch wacom-08-add-support-for-bamboo-pen.patch ApplyPatch wacom-09-disable-bamboo-touchpad-when-pen-is-being-used.patch # Runtime PM -ApplyPatch linux-2.6-bluetooth-autosuspend.patch -ApplyPatch linux-2.6-uvc-autosuspend.patch -ApplyPatch linux-2.6-qcserial-autosuspend.patch -ApplyPatch linux-2.6-usb-pci-autosuspend.patch -ApplyPatch linux-2.6-enable-more-pci-autosuspend.patch +# (there's still dragons here, disabled for now... --kyle) +#ApplyPatch linux-2.6-bluetooth-autosuspend.patch +#ApplyPatch linux-2.6-uvc-autosuspend.patch +#ApplyPatch linux-2.6-qcserial-autosuspend.patch +#ApplyPatch linux-2.6-usb-pci-autosuspend.patch +#ApplyPatch linux-2.6-enable-more-pci-autosuspend.patch # PCI patches to fix problems with _CRS # ( from https://bugzilla.kernel.org/show_bug.cgi?id=16228#c49 ) @@ -1939,6 +1940,10 @@ fi # || || %changelog +* Thu Oct 14 2010 Kyle McMartin <kyle@redhat.com> 2.6.36-0.37.rc7.git5 +- Linux 2.6.36-rc7-git5 +- Disable runtime PM until it can be poked at. + * Tue Oct 12 2010 Kyle McMartin <kyle@redhat.com> 2.6.36-0.36.rc7.git3 - Linux 2.6.36-rc7-git3 - Drop fix-oldnoconfig-to-dtrt.patch, nonintconfig patches are upstream! @@ -1,3 +1,3 @@ 091abeb4684ce03d1d936851618687b6 linux-2.6.35.tar.bz2 d8e63ac9d7e25fb71a04ded58240ac96 patch-2.6.36-rc7.bz2 -1b88b01aa513aff92cee1e7238217b18 patch-2.6.36-rc7-git3.bz2 +45e2d044ad81710b49d7a8c5583fd033 patch-2.6.36-rc7-git5.bz2 |