aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2007-10-13 22:36:01 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2007-10-13 22:36:01 -0700
commitd373563eeb040baa39511f5f1b677b4e3e36599e (patch)
tree8fe9acb0cebdf0ac75952d314dfd3a397c170975
parent37a8dc26a57317f13a55eaaf2f497369aad375b0 (diff)
downloadpatches-d373563eeb040baa39511f5f1b677b4e3e36599e.tar.gz
2.6.23-git4 update
-rw-r--r--driver/block-device.patch2
-rw-r--r--driver/sysfs-crash-debugging.patch4
-rw-r--r--version2
3 files changed, 4 insertions, 4 deletions
diff --git a/driver/block-device.patch b/driver/block-device.patch
index a3266ff91e8b80..48906a4f50da69 100644
--- a/driver/block-device.patch
+++ b/driver/block-device.patch
@@ -955,7 +955,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
-@@ -1211,7 +1211,7 @@ static struct kobject *exact_match(dev_t
+@@ -1210,7 +1210,7 @@ static struct kobject *exact_match(dev_t
{
struct gendisk *p = data;
*part &= (1 << PARTN_BITS) - 1;
diff --git a/driver/sysfs-crash-debugging.patch b/driver/sysfs-crash-debugging.patch
index f667710c0d134c..e5a96d696932a6 100644
--- a/driver/sysfs-crash-debugging.patch
+++ b/driver/sysfs-crash-debugging.patch
@@ -27,7 +27,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/arch/x86/kernel/traps_32.c
+++ b/arch/x86/kernel/traps_32.c
-@@ -425,6 +425,7 @@ void die(const char * str, struct pt_reg
+@@ -423,6 +423,7 @@ void die(const char * str, struct pt_reg
#endif
if (nl)
printk("\n");
@@ -37,7 +37,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
NOTIFY_STOP) {
--- a/arch/x86/kernel/traps_64.c
+++ b/arch/x86/kernel/traps_64.c
-@@ -521,6 +521,7 @@ void __kprobes __die(const char * str, s
+@@ -519,6 +519,7 @@ void __kprobes __die(const char * str, s
printk("DEBUG_PAGEALLOC");
#endif
printk("\n");
diff --git a/version b/version
index 031326cea7da36..f941aace83d229 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.23-git1
+2.6.23-git4