Merge tag 'linus-mce-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 May 2012 16:42:20 +0000 (09:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 May 2012 16:42:20 +0000 (09:42 -0700)
commit3d9944978e0bb6c98b901949cb7a22256e48b23d
treeea068a5eaca4d5ae5c02afcf903665a1f4cfb65b
parent42ea7d7f2a7356962022cdd124d9043c488ca5e2
parentdad1743e5993f19b3d7e7bd0fb35dc45b5326626
Merge tag 'linus-mce-fix' of git://git./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