From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 16 May 2019 18:55:35 +0000 (-0700)
Subject: Merge tag 'edac_fixes_for_5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
X-Git-Tag: v5.2-rc1~34
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=11b1177399b69528f75ad7594ce93c957d4d16b6;p=users%2Fhch%2Fmisc.git

Merge tag 'edac_fixes_for_5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

Pull EDAC fixes from Borislav Petkov:

 - Do not build mpc85_edac as a module (Michael Ellerman)

 - Correct edac_mc_find()'s return value on error (Robert Richter)

* tag 'edac_fixes_for_5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC/mc: Fix edac_mc_find() in case no device is found
  EDAC/mpc85xx: Prevent building as a module
---

11b1177399b69528f75ad7594ce93c957d4d16b6