[kernel/rawhide/user/kyle/kernel-git] Linux 2.6.37-rc1-git7

[Kyle McMartin]

commit 8383538959a3705b40f1f533e1da3145dbbb7a7f
Author: Kyle McMartin <kyle at mcmartin.ca>
Date:   Tue Nov 9 09:01:34 2010 -0500

    Linux 2.6.37-rc1-git7

 .gitignore                   |    2 +-
 kernel.spec                  |    5 ++++-
 linux-2.6-crash-driver.patch |   24 ++++++++++--------------
 sources                      |    2 +-
 4 files changed, 16 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1f74bd3..49bbef4 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-git5.bz2
+/patch-2.6.37-rc1-git7.bz2
diff --git a/kernel.spec b/kernel.spec
index 5f2e001..5d2afdb 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 5
+%define gitrev 7
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1901,6 +1901,9 @@ fi
 #                 ||     ||
 
 %changelog
+* Tue Nov 09 2010 Kyle McMartin <kyle at redhat.com> 2.6.37-0.1.rc1.git7
+- Linux 2.6.37-rc1-git7
+
 * Mon Nov 08 2010 Kyle McMartin <kyle at redhat.com> 2.6.37-0.1.rc1.git5
 - Linux 2.6.37-rc1-git5
 
diff --git a/linux-2.6-crash-driver.patch b/linux-2.6-crash-driver.patch
index 7b518bb..0f11aba 100644
--- a/linux-2.6-crash-driver.patch
+++ b/linux-2.6-crash-driver.patch
@@ -233,18 +233,6 @@ index 3141dd3..153658c 100644
  
  config LEGACY_PTY_COUNT
  	int "Maximum number of legacy PTY in use"
-diff --git a/drivers/char/Makefile b/drivers/char/Makefile
-index f957edf..604c418 100644
---- a/drivers/char/Makefile
-+++ b/drivers/char/Makefile
-@@ -111,6 +111,8 @@ obj-$(CONFIG_PS3_FLASH)		+= ps3flash.o
- obj-$(CONFIG_JS_RTC)		+= js-rtc.o
- js-rtc-y = rtc.o
- 
-+obj-$(CONFIG_CRASH)		+= crash.o
-+
- # Files generated that shall be removed upon make clean
- clean-files := consolemap_deftbl.c defkeymap.c
  
 diff --git a/drivers/char/crash.c b/drivers/char/crash.c
 new file mode 100644
@@ -380,6 +368,14 @@ index 0000000..e5437de
 +module_exit(crash_cleanup_module);
 +
 +MODULE_LICENSE("GPL");
--- 
-1.7.0.1
 
+diff --git a/drivers/char/Makefile b/drivers/char/Makefile
+index ba53ec9..6588b33 100644
+--- a/drivers/char/Makefile
++++ b/drivers/char/Makefile
+@@ -98,3 +98,5 @@ obj-$(CONFIG_RAMOOPS)		+= ramoops.o
+ 
+ obj-$(CONFIG_JS_RTC)		+= js-rtc.o
+ js-rtc-y = rtc.o
++
++obj-$(CONFIG_CRASH)		+= crash.o
diff --git a/sources b/sources
index 67b4be7..9b2f9be 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 61f3739a73afb6914cb007f37fb09b62  linux-2.6.36.tar.bz2
 7364d9629734c34d09ec9ebd351d40b9  patch-2.6.37-rc1.bz2
-d378228e109a29a513e2ceba02eebf70  patch-2.6.37-rc1-git5.bz2
+b794491328289db900d725673a23fd08  patch-2.6.37-rc1-git7.bz2