Linus Torvalds
faa8b6c3c2
Revert "ipmi: add new IPMI nmi watchdog handling"
...
This reverts commit f64da958df .
Andi Kleen is unhappy with the changes, and they really do not seem
worth it. IPMI could use DIE_NMI_IPI instead of the new callback, even
though that ends up having its own set of problems too, mainly because
the IPMI code cannot really know the NMI was from IPMI or not.
Manually fix up conflicts in arch/x86_64/kernel/traps.c and
drivers/char/ipmi/ipmi_watchdog.c.
Cc: Andi Kleen <ak@suse.de>
Cc: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Cc: Corey Minyard <minyard@acm.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-14 15:24:24 -07:00
..
agp
x86_64: off-by-two error in aperture.c
2007-05-11 12:53:00 -07:00
drm
Fix occurrences of "the the "
2007-05-09 08:57:56 +02:00
hw_random
pasemi: hardware rng driver
2007-05-09 12:30:49 -07:00
ip2
Fix bogus 'inline' in drivers/char/ip2/i2lib.c
2007-02-21 11:18:26 -08:00
ipmi
Revert "ipmi: add new IPMI nmi watchdog handling"
2007-05-14 15:24:24 -07:00
mwave
[PATCH] mwave: interesting flags savings
2007-02-20 17:10:14 -08:00
pcmcia
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
2007-05-09 12:54:17 -07:00
rio
Overrun in drivers/char/rio/riocmd.c
2007-05-11 08:29:34 -07:00
tpm
Missing include file in tpm_atmel.h
2007-05-12 10:55:39 -07:00
watchdog
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2007-05-11 19:03:13 +00:00
.gitignore
[MIPS] Remove IT8172-based platforms, ITE 8172G and Globespan IVR support.
2006-10-03 17:59:17 +01:00
amiserial.c
drivers/char: use __set_current_state()
2007-05-08 11:15:13 -07:00
apm-emulation.c
[APM] Add shared version of APM emulation
2007-02-09 17:08:57 +00:00
applicom.c
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
2006-10-05 15:10:12 +01:00
applicom.h
briq_panel.c
[POWERPC] Rename get_property to of_get_property: drivers
2007-05-02 20:04:32 +10:00
cd1865.h
ChangeLog
consolemap.c
console UTF-8 fixes
2007-05-08 11:15:12 -07:00
cp437.uni
cs5535_gpio.c
Char: cs5535_gpio, add MODULE_DEVICE_TABLE
2007-05-08 11:15:04 -07:00
cyclades.c
Char: cyclades, copyright and version changes
2007-05-08 11:15:25 -07:00
decserial.c
[PATCH] dz: Fixes to make it work
2006-12-07 08:39:41 -08:00
defkeymap.c_shipped
defkeymap.map
digi1.h
digiFep1.h
digiPCI.h
ds1286.c
[CHAR] ds1286: Fix handling of seconds in RTC_ALM_SET ioctl.
2007-03-08 01:10:30 +00:00
ds1302.c
[PATCH] DS1302: local_irq_disable() is redundant after local_irq_save()
2007-02-12 09:48:30 -08:00
ds1620.c
header cleaning: don't include smp_lock.h when not used
2007-05-08 11:15:07 -07:00
dsp56k.c
header cleaning: don't include smp_lock.h when not used
2007-05-08 11:15:07 -07:00
dtlk.c
dtlk: fix error checks in module_init()
2007-05-08 11:15:09 -07:00
ec3104_keyb.c
header cleaning: don't include smp_lock.h when not used
2007-05-08 11:15:07 -07:00
efirtc.c
epca.c
drivers/char: use __set_current_state()
2007-05-08 11:15:13 -07:00
epca.h
[PATCH] char: kill unneeded memsets
2006-10-04 07:55:13 -07:00
epcaconfig.h
esp.c
[PATCH] tty: switch to ktermios
2006-12-08 08:28:57 -08:00
generic_nvram.c
[PATCH] mark struct file_operations const 3
2007-02-12 09:48:45 -08:00
generic_serial.c
[PATCH] generic_serial: fix decoding of baud rate
2007-03-27 09:05:15 -07:00
genrtc.c
Correct comments in genrtc.c to refer to correct /proc file.
2007-05-09 07:21:11 +02:00
hangcheck-timer.c
header cleaning: don't include smp_lock.h when not used
2007-05-08 11:15:07 -07:00
hpet.c
[PATCH] sysctl: remove insert_at_head from register_sysctl
2007-02-14 08:09:59 -08:00
hvc_beat.c
[POWERPC] Celleb: hypervisor console driver
2007-02-07 14:03:21 +11:00
hvc_console.c
drivers/char/hvc_console.c: cleanups
2007-05-08 11:14:59 -07:00
hvc_console.h
hvc_iseries.c
[POWERPC] Rename device_is_compatible to of_device_is_compatible
2007-05-07 20:31:14 +10:00
hvc_rtas.c
hvc_vio.c
[POWERPC] Rename device_is_compatible to of_device_is_compatible
2007-05-07 20:31:14 +10:00
hvcs.c
[PATCH] tty: switch to ktermios
2006-12-08 08:28:57 -08:00
hvsi.c
[POWERPC] Rename get_property to of_get_property: partial drivers
2007-04-27 15:51:56 +10:00
i8k.c
i386: sched.h inclusion from module.h is baack
2007-05-08 11:15:08 -07:00
ip27-rtc.c
header cleaning: don't include smp_lock.h when not used
2007-05-08 11:15:07 -07:00
isicom.c
Char: isicom, use pr_debug
2007-05-08 11:15:24 -07:00
istallion.c
[PATCH] Char: tty_wakeup cleanup
2007-02-11 10:51:26 -08:00
Kconfig
[S390] Kconfig: use common Kconfig files for s390.
2007-05-10 15:46:08 +02:00
keyboard.c
SPIN_LOCK_UNLOCKED cleanup in drivers/char/keyboard
2007-05-08 11:15:11 -07:00
lcd.c
[CHAR] lcd: Fix two warnings.
2007-03-17 01:03:26 +00:00
lcd.h
[MIPS] Add MTD device support for Cobalt
2007-02-20 17:11:55 +00:00
lp.c
ROUND_UP macro cleanup in drivers/char/lp.c
2007-05-08 11:15:08 -07:00
Makefile
rename TANBAC TB0219 config
2007-05-07 12:13:04 -07:00
mbcs.c
[PATCH] mark struct file_operations const 3
2007-02-12 09:48:45 -08:00
mbcs.h
mem.c
Make /dev/port conditional on config symbol
2007-05-08 11:15:07 -07:00
misc.c
use mutex instead of semaphore for misc char devices
2007-05-08 11:15:15 -07:00
mmtimer.c
[IA64-SN2][KJ] mmtimer.c-kzalloc
2007-05-08 11:53:27 -07:00
moxa.c
old buffer overflow in moxa driver
2007-05-08 11:15:14 -07:00
mspec.c
[PATCH] mark struct file_operations const 3
2007-02-12 09:48:45 -08:00
mxser.c
header cleaning: don't include smp_lock.h when not used
2007-05-08 11:15:07 -07:00
mxser.h
[PATCH] mxser: remove ambiguous redefinition of INIT_WORK
2007-02-11 10:51:25 -08:00
mxser_new.c
header cleaning: don't include smp_lock.h when not used
2007-05-08 11:15:07 -07:00
mxser_new.h
[PATCH] Char: mxser_new, upgrade to 1.9.15
2007-02-11 10:51:29 -08:00
n_hdlc.c
n_r3964.c
drivers/char: use __set_current_state()
2007-05-08 11:15:13 -07:00
n_tty.c
tty: add compat_ioctl
2007-05-11 08:29:35 -07:00
nsc_gpio.c
[PATCH] struct path: convert char-drivers
2006-12-08 08:28:44 -08:00
nvram.c
[PATCH] remove many unneeded #includes of sched.h
2007-02-14 08:09:54 -08:00
nwbutton.c
[PATCH] Char: timers cleanup
2007-02-12 09:48:30 -08:00
nwbutton.h
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
2006-10-05 15:10:12 +01:00
nwflash.c
[PATCH] remove many unneeded #includes of sched.h
2007-02-14 08:09:54 -08:00
pc8736x_gpio.c
ppdev.c
header cleaning: don't include smp_lock.h when not used
2007-05-08 11:15:07 -07:00
pty.c
[PATCH] remove many unneeded #includes of sched.h
2007-02-14 08:09:54 -08:00
random.c
[NET]: random functions can use nsec resolution instead of usec
2007-04-25 22:28:25 -07:00
raw.c
[PATCH] raw: don't allow the creation of a raw device with minor number 0
2007-02-11 10:51:34 -08:00
riscom8.c
drivers/char: use __set_current_state()
2007-05-08 11:15:13 -07:00
riscom8.h
riscom8_reg.h
rocket.c
Kill unused sesssion and group values in rocket driver
2007-05-11 08:29:36 -07:00
rocket.h
rocket_int.h
Kill unused sesssion and group values in rocket driver
2007-05-11 08:29:36 -07:00
rtc.c
drivers/char: use __set_current_state()
2007-05-08 11:15:13 -07:00
scc.h
scx200_gpio.c
selection.c
drivers/char: use __set_current_state()
2007-05-08 11:15:13 -07:00
ser_a2232.c
[PATCH] remove many unneeded #includes of sched.h
2007-02-14 08:09:54 -08:00
ser_a2232.h
ser_a2232fw.ax
ser_a2232fw.h
serial167.c
drivers/char: use __set_current_state()
2007-05-08 11:15:13 -07:00
snsc.c
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
2006-10-05 15:10:12 +01:00
snsc.h
snsc_event.c
[IA64] drivers/char/snsc_event.c:206: warning: unused variable `p'
2007-05-10 13:23:05 -07:00
sonypi.c
sonypi: use mutex instead of semaphore
2007-04-28 22:13:34 -04:00
specialix.c
[PATCH] Char: timers cleanup
2007-02-12 09:48:30 -08:00
specialix_io8.h
stallion.c
[PATCH] Char: stallion, use dynamic dev
2006-12-08 08:28:59 -08:00
sx.c
[PATCH] sx: fix non-PCI build
2006-12-13 09:05:49 -08:00
sx.h
[PATCH] Char: sx, request regions
2006-12-08 08:28:59 -08:00
sxboards.h
sxwindow.h
synclink.c
drivers/char/synclink.c: check kmalloc() return value
2007-05-08 11:15:02 -07:00
synclink_gt.c
synclink_gt: add compat_ioctl
2007-05-11 08:29:34 -07:00
synclinkmp.c
[PATCH] Char: timers cleanup
2007-02-12 09:48:30 -08:00
sysrq.c
header cleaning: don't include smp_lock.h when not used
2007-05-08 11:15:07 -07:00
tb0219.c
[PATCH] struct path: convert char-drivers
2006-12-08 08:28:44 -08:00
tipar.c
layered parport code uses parport->dev
2007-05-08 11:15:05 -07:00
tlclk.c
[PATCH] remove many unneeded #includes of sched.h
2007-02-14 08:09:54 -08:00
toshiba.c
[PATCH] remove many unneeded #includes of sched.h
2007-02-14 08:09:54 -08:00
tty_io.c
tty: flush flip buffer on ldisc input queue flush
2007-05-12 10:55:39 -07:00
tty_ioctl.c
[PATCH] tty: improve encode_baud_rate logic
2007-02-11 10:51:32 -08:00
vc_screen.c
use mutex instead of semaphore in virtual console driver
2007-05-08 11:15:33 -07:00
viocons.c
[POWERPC] iSeries: fix viocons init
2006-12-20 16:37:48 +11:00
viotape.c
[PATCH] mark struct file_operations const 3
2007-02-12 09:48:45 -08:00
vme_scc.c
[PATCH] remove many unneeded #includes of sched.h
2007-02-14 08:09:54 -08:00
vr41xx_giu.c
[MIPS] Vr41xx: Fix after GENERIC_HARDIRQS_NO__DO_IRQ change
2007-01-23 18:26:47 +00:00
vt.c
use mutex instead of semaphore in virtual console driver
2007-05-08 11:15:33 -07:00
vt_ioctl.c
drivers/char: use __set_current_state()
2007-05-08 11:15:13 -07:00