diff options
| author | Kyle McMartin <kyle@mcmartin.ca> | 2010-11-13 22:18:22 -0500 |
|---|---|---|
| committer | Kyle McMartin <kyle@mcmartin.ca> | 2010-11-13 22:18:22 -0500 |
| commit | 1d6dcd2719d378a507a5369c6017e8f616333f06 (patch) | |
| tree | 399a7c2c89b660a67f73bcdba5c06d2bc6f9acc9 /kernel.spec | |
| parent | 8383538959a3705b40f1f533e1da3145dbbb7a7f (diff) | |
| download | kernel-1d6dcd2719d378a507a5369c6017e8f616333f06.tar.gz kernel-1d6dcd2719d378a507a5369c6017e8f616333f06.tar.xz kernel-1d6dcd2719d378a507a5369c6017e8f616333f06.zip | |
Merge 2.6.37-rc1-git10
- Pull in 2.6.37-rc1-git10 snapshot
- SECURITY_DMESG_RESTRICT added, the principle of least surprise dictates
we should probably have it off. If you want to restrict dmesg access
you may use the kernel.dmesg_restrict sysctl.
- linux-2.6-bluetooth-autosuspend.patch: merged upstream.
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec index 5d2afdb82..7f1cfd531 100644 --- a/kernel.spec +++ b/kernel.spec @@ -84,7 +84,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 1 # The git snapshot level -%define gitrev 7 +%define gitrev 10 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -693,7 +693,6 @@ Patch12018: neuter_intel_microcode_load.patch Patch12030: tpm-fix-stall-on-boot.patch # Runtime power management -Patch12200: linux-2.6-bluetooth-autosuspend.patch Patch12203: linux-2.6-usb-pci-autosuspend.patch Patch12204: linux-2.6-enable-more-pci-autosuspend.patch Patch12205: runtime_pm_fixups.patch @@ -1281,7 +1280,6 @@ ApplyPatch neuter_intel_microcode_load.patch ApplyPatch tpm-fix-stall-on-boot.patch # Runtime PM -ApplyPatch linux-2.6-bluetooth-autosuspend.patch ApplyPatch linux-2.6-usb-pci-autosuspend.patch ApplyPatch linux-2.6-enable-more-pci-autosuspend.patch ApplyPatch runtime_pm_fixups.patch @@ -1901,6 +1899,13 @@ fi # || || %changelog +* Sat Nov 13 2010 Kyle McMartin <kyle@redhat.com> 2.6.37-0.1.rc1.git10 +- Linux 2.6.37-rc1-git10 +- SECURITY_DMESG_RESTRICT added, the principle of least surprise dictates + we should probably have it off. If you want to restrict dmesg access + you may use the kernel.dmesg_restrict sysctl. +- linux-2.6-bluetooth-autosuspend.patch: merged upstream. + * Tue Nov 09 2010 Kyle McMartin <kyle@redhat.com> 2.6.37-0.1.rc1.git7 - Linux 2.6.37-rc1-git7 |