Merge tag 'edac_fixes_for_5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 May 2019 18:55:35 +0000 (11:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 May 2019 18:55:35 +0000 (11:55 -0700)
commit11b1177399b69528f75ad7594ce93c957d4d16b6
tree67b61e1c07e2e737cd20188edcb8be78ef6e15d2
parent4e785e8d9947f0f75e39cf3034dd6f55170c514b
parent29a0c843973bc385918158c6976e4dbe891df969
Merge tag 'edac_fixes_for_5.2' of git://git./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