]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b742258 d302f86)
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)
commit6504954fe94fcb071683586f1fbf686fad027e40
treeea068a5eaca4d5ae5c02afcf903665a1f4cfb65btree | snapshot
parentb74225872c21d6c26d96bb681391f6068be6704dcommit | diff
parentd302f86d8364c37d015aab30f0aff8dd7b8cb15ecommit | 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
Linux Kernel Source Tree.