From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 16 Feb 2020 20:49:36 +0000 (-0800)
Subject: Merge tag 'edac_urgent_for_5.6' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.15~4458
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b982df72ef8404de99597f1d956b6137533b429a;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'edac_urgent_for_5.6' of git://git./linux/kernel/git/ras/ras

Pull EDAC fixes from Borislav Petkov:
 "Two fixes for use-after-free and memory leaking in the EDAC core, by
  Robert Richter.

  Debug options like DEBUG_TEST_DRIVER_REMOVE, KASAN and DEBUG_KMEMLEAK
  unearthed issues with the lifespan of memory allocated by the EDAC
  memory controller descriptor due to misdesigned memory freeing, done
  partially by the EDAC core *and* the driver core, which is problematic
  to say the least.

  These two are minimal fixes to take care of stable - a proper rework
  is following which cleans up that mess properly"

* tag 'edac_urgent_for_5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  EDAC/sysfs: Remove csrow objects on errors
  EDAC/mc: Fix use-after-free and memleaks during device removal
---

b982df72ef8404de99597f1d956b6137533b429a