Merge tag 'ras_for_3.21' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras...
authorIngo Molnar <mingo@kernel.org>
Thu, 19 Feb 2015 12:18:02 +0000 (13:18 +0100)
committerIngo Molnar <mingo@kernel.org>
Thu, 19 Feb 2015 12:31:33 +0000 (13:31 +0100)
commitfa45a45ca34891614789e68dfbf7ce344c9013ac
tree175d96fcb279055882c08be06e1c9f5806d87476
parente07e0d4cb0c4bfe822ec8491cc06269096a38bea
parentd79f931f1c8b6963e13a3738ef2906ba89bb8d12
Merge tag 'ras_for_3.21' of git://git./linux/kernel/git/ras/ras into x86/ras

Pull RAS updates from Borislav Petkov:

 "- Enable AMD thresholding IRQ by default if supported. (Aravind Gopalakrishnan)

  - Unify mce_panic() message pattern. (Derek Che)

  - A bit more involved simplification of the CMCI logic after yet another
    report about race condition with the adaptive logic. (Borislav Petkov)

  - ACPI APEI EINJ fleshing out of the user documentation. (Borislav Petkov)

  - Minor cleanup. (Jan Beulich.)"

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/include/asm/mce.h
arch/x86/kernel/cpu/mcheck/mce.c