From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 27 Jun 2020 20:08:14 +0000 (-0700)
Subject: Merge tag 'edac_urgent_for_5.8' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.15~3494
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=42f8f9bc5cb7c35ca04a6867cc01c24538d59f7f;p=platform%2Fkernel%2Flinux-starfive.git

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

Pull EDAC fix from Borislav Petkov:
 "A single fix for amd64_edac restoring the reporting of the DRAM scrub
  rate on family 0x15 CPUs"

* tag 'edac_urgent_for_5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  EDAC/amd64: Read back the scrub rate PCI register on F15h
---

42f8f9bc5cb7c35ca04a6867cc01c24538d59f7f