diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-04-12 11:55:06 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-04-12 11:55:06 -0700 |
| commit | 6939471a340468dc686845aef597be6c4a3346aa (patch) | |
| tree | c33aa90309431fae12724da0018125be9dba803a /driver | |
| parent | b66994d6a315f2dd0ca3ec8e5eb12f273ab8e336 (diff) | |
| download | patches-6939471a340468dc686845aef597be6c4a3346aa.tar.gz | |
2.6.17-rc1-git5 resync
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/spi-add-david-as-the-spi-subsystem-maintainer.patch | 2 | ||||
| -rw-r--r-- | driver/sysfs-crash-debugging.patch | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/driver/spi-add-david-as-the-spi-subsystem-maintainer.patch b/driver/spi-add-david-as-the-spi-subsystem-maintainer.patch index c7cfc46ec1175..40d08a7eecfcb 100644 --- a/driver/spi-add-david-as-the-spi-subsystem-maintainer.patch +++ b/driver/spi-add-david-as-the-spi-subsystem-maintainer.patch @@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/MAINTAINERS +++ gregkh-2.6/MAINTAINERS -@@ -2492,6 +2492,12 @@ M: perex@suse.cz +@@ -2490,6 +2490,12 @@ M: perex@suse.cz L: alsa-devel@alsa-project.org S: Maintained diff --git a/driver/sysfs-crash-debugging.patch b/driver/sysfs-crash-debugging.patch index d1ecd0e00c546..855e1c42a2312 100644 --- a/driver/sysfs-crash-debugging.patch +++ b/driver/sysfs-crash-debugging.patch @@ -25,14 +25,14 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/arch/i386/kernel/traps.c +++ gregkh-2.6/arch/i386/kernel/traps.c -@@ -385,6 +385,7 @@ void die(const char * str, struct pt_reg +@@ -388,6 +388,7 @@ void die(const char * str, struct pt_reg #endif if (nl) printk("\n"); + sysfs_printk_last_file(); if (notify_die(DIE_OOPS, str, regs, err, current->thread.trap_no, SIGSEGV) != - NOTIFY_STOP) + NOTIFY_STOP) { --- gregkh-2.6.orig/arch/x86_64/kernel/traps.c +++ gregkh-2.6/arch/x86_64/kernel/traps.c @@ -427,6 +427,7 @@ void __kprobes __die(const char * str, s |