| commit | 3d9944978e0bb6c98b901949cb7a22256e48b23d | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 18 09:42:20 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 18 09:42:20 2012 -0700 |
| tree | ea068a5eaca4d5ae5c02afcf903665a1f4cfb65b | |
| parent | 42ea7d7f2a7356962022cdd124d9043c488ca5e2 [diff] | |
| parent | dad1743e5993f19b3d7e7bd0fb35dc45b5326626 [diff] |
Merge tag 'linus-mce-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras Pull a machine check recovery fix from Tony Luck. I really don't like how the MCE code does some of the things it does, but this does seem to be an improvement. * tag 'linus-mce-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras: x86/mce: Only restart instruction after machine check recovery if it is safe