Merge tag 'ras_for_3.21' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/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>

diff --cc arch/x86/include/asm/mce.h
index 9b3de99,13eeea5..fd38a23
--- 1/arch/x86/include/asm/mce.h
--- 2/arch/x86/include/asm/mce.h
+++ b/arch/x86/include/asm/mce.h
@@@ -183,13 -183,14 +183,13 @@@ typedef DECLARE_BITMAP(mce_banks_t, MAX
  DECLARE_PER_CPU(mce_banks_t, mce_poll_banks);
  
  enum mcp_flags {
-       MCP_TIMESTAMP = (1 << 0),       /* log time stamp */
-       MCP_UC = (1 << 1),              /* log uncorrected errors */
-       MCP_DONTLOG = (1 << 2),         /* only clear, don't log */
+       MCP_TIMESTAMP   = BIT(0),       /* log time stamp */
+       MCP_UC          = BIT(1),       /* log uncorrected errors */
+       MCP_DONTLOG     = BIT(2),       /* only clear, don't log */
  };
- void machine_check_poll(enum mcp_flags flags, mce_banks_t *b);
+ bool machine_check_poll(enum mcp_flags flags, mce_banks_t *b);
  
  int mce_notify_irq(void);
 -void mce_notify_process(void);
  
  DECLARE_PER_CPU(struct mce, injectm);
  

diff --cc arch/x86/kernel/cpu/mcheck/mce.c
Simple merge