diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-18 18:42:20 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-18 18:42:20 +0200 |
| commit | 3d9944978e0bb6c98b901949cb7a22256e48b23d (patch) | |
| tree | ea068a5eaca4d5ae5c02afcf903665a1f4cfb65b /fs/proc | |
| parent | Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm (diff) | |
| parent | x86/mce: Only restart instruction after machine check recovery if it is safe (diff) | |
| download | linux-3d9944978e0bb6c98b901949cb7a22256e48b23d.tar.xz linux-3d9944978e0bb6c98b901949cb7a22256e48b23d.zip | |
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
Diffstat (limited to 'fs/proc')
0 files changed, 0 insertions, 0 deletions