From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 22 Jun 2025 17:05:33 +0000 (-0700)
Subject: Merge tag 'edac_urgent_for_v6.16_rc3' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v6.16-rc3~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=73543bad766486c3cdbf6fa9d1faf7d0c4bcc7af;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'edac_urgent_for_v6.16_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras

Pull EDAC fixes from Borislav Petkov:

 - amd64: Correct the number of memory controllers on some AMD Zen
   clients

 - igen6: Handle firmware-disabled memory controllers properly

* tag 'edac_urgent_for_v6.16_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  EDAC/igen6: Fix NULL pointer dereference
  EDAC/amd64: Correct number of UMCs for family 19h models 70h-7fh
---

73543bad766486c3cdbf6fa9d1faf7d0c4bcc7af