From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 11 Apr 2021 18:42:18 +0000 (-0700)
Subject: Merge tag 'x86_urgent_for_v5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: nvme-5.13-2021-05-05~175
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=06f838e02d3b6e161df08c910e12e8366f1cb465;p=nvme.git

Merge tag 'x86_urgent_for_v5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Borislav Petkov:

 - Fix the vDSO exception handling return path to disable interrupts
   again.

 - A fix for the CE collector to return the proper return values to its
   callers which are used to convey what the collector has done with the
   error address.

* tag 'x86_urgent_for_v5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/traps: Correct exc_general_protection() and math_error() return paths
  RAS/CEC: Correct ce_add_elem()'s returned values
---

06f838e02d3b6e161df08c910e12e8366f1cb465