[kernel/rawhide/user/kyle/kernel-git] Merge 2.6.37-rc1-git10

[Kyle McMartin]

commit 1d6dcd2719d378a507a5369c6017e8f616333f06
Author: Kyle McMartin <kyle at mcmartin.ca>
Date:   Sat Nov 13 22:18:22 2010 -0500

    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.

 .gitignore                            |    2 +-
 config-generic                        |    3 +
 kernel.spec                           |   11 ++-
 linux-2.6-bluetooth-autosuspend.patch |  159 ---------------------------------
 sources                               |    2 +-
 5 files changed, 13 insertions(+), 164 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 49bbef4..165240b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,4 @@ clog
 *.rpm
 kernel-2.6.*/
 /patch-2.6.37-rc1.bz2
-/patch-2.6.37-rc1-git7.bz2
+/patch-2.6.37-rc1-git10.bz2
diff --git a/config-generic b/config-generic
index 9a0b10b..5b6b291 100644
--- a/config-generic
+++ b/config-generic
@@ -3670,6 +3670,7 @@ CONFIG_KGDB_LOW_LEVEL_TRAP=y
 # Security options
 #
 CONFIG_SECURITY=y
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
 CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_NETWORK_XFRM=y
 # CONFIG_SECURITY_PATH is not set
@@ -4019,6 +4020,8 @@ CONFIG_LEDS_REGULATOR=m
 CONFIG_LEDS_LT3593=m
 CONFIG_LEDS_TRIGGER_GPIO=m
 CONFIG_LEDS_INTEL_SS4200=m
+CONFIG_LEDS_LP5521=m
+CONFIG_LEDS_LP5523=m
 
 CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
diff --git a/kernel.spec b/kernel.spec
index 5d2afdb..7f1cfd5 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 at 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 at redhat.com> 2.6.37-0.1.rc1.git7
 - Linux 2.6.37-rc1-git7
 
diff --git a/sources b/sources
index 9b2f9be..285c813 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 61f3739a73afb6914cb007f37fb09b62  linux-2.6.36.tar.bz2
 7364d9629734c34d09ec9ebd351d40b9  patch-2.6.37-rc1.bz2
-b794491328289db900d725673a23fd08  patch-2.6.37-rc1-git7.bz2
+99827f19411ac74a4789cb6395e4568d  patch-2.6.37-rc1-git10.bz2