]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5cb52b5 feab21f)
Merge branch 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Jan 2016 23:07:19 +0000 (15:07 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Jan 2016 23:07:19 +0000 (15:07 -0800)
Pull RAS updates from Ingo Molnar:
 "Various x86 MCE fixes and small enhancements"

* 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mce: Make usable address checks Intel-only
  x86/mce: Add the missing memory error check on AMD
  x86/RAS: Remove mce.usable_addr
  x86/mce: Do not enter deferred errors into the generic pool twice

1  2 
arch/x86/kernel/cpu/mcheck/mce.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/kernel/cpu/mcheck/mce.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.