Merge tag 'x86_urgent_for_v5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 11 Apr 2021 18:42:18 +0000 (11:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 11 Apr 2021 18:42:18 +0000 (11:42 -0700)
commit06f838e02d3b6e161df08c910e12e8366f1cb465
treeb380ea8289b54e5cd1dc09a962e938361e5d9d91
parent52e44129fba5cfc4e351fdb5e45849afc74d9a53
parent632a1c209b8773cb0119fe3aada9f1db14fa357c
Merge tag 'x86_urgent_for_v5.12-rc7' of git://git./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