Merge tag 'edac_urgent_for_5.8' of git://git.kernel.org/pub/scm/linux/kernel/git...
commit42f8f9bc5cb7c35ca04a6867cc01c24538d59f7f
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 27 Jun 2020 20:08:14 +0000 (27 13:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 27 Jun 2020 20:08:14 +0000 (27 13:08 -0700)
treea49d3f95d9e332c80f3646e720511a105b53ea78
parentf05baa066d0f6a38f0624c28008fb2f53cd00e17
parentee470bb25d0dcdf126f586ec0ae6dca66cb340a4
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