projects / linux-flexiantxendom0-3.2.10.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 42ea7d7 dad1743)
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)
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


Trivial merge
Port of xen3.3 xenlinux code to Ubuntu packaged SUSE kernel (3.2.10)