From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 26 Sep 2021 19:18:10 +0000 (-0700)
Subject: Merge tag 'edac_urgent_for_v5.15_rc3' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.15-rc3~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=996148ee05d08ef5163cad99c33a7b5e844ac494;p=thirdparty%2Flinux.git

Merge tag 'edac_urgent_for_v5.15_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras

Pull EDAC fixes from Borislav Petkov:
 "Fix two EDAC drivers using the wrong value type for the DIMM mode"

* tag 'edac_urgent_for_v5.15_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  EDAC/dmc520: Assign the proper type to dimm->edac_mode
  EDAC/synopsys: Fix wrong value type assignment for edac_mode
---

996148ee05d08ef5163cad99c33a7b5e844ac494