From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 16 Nov 2025 15:05:24 +0000 (-0800)
Subject: Merge tag 'edac_urgent_for_v6.18_rc6' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v6.18-rc6~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=87751e715e23ede7386fb57a1a8593aa9830b21f;p=thirdparty%2Flinux.git

Merge tag 'edac_urgent_for_v6.18_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras

Pull EDAC fixes from Borislav Petkov:

 - In Versalnet, handle the reporting of non-standard hw errors whose
   information can come in more than one remote processor message.

 - Explicitly reenable ECC checking after a warm reset in Altera OCRAM
   as those registers are reset to default otherwise

 - Fix single-bit error injection in Altera EDAC to not inject errors
   directly in ECC RAM and thus lead to false double-bit errors due to
   same ECC RAM being in concurrent use

* tag 'edac_urgent_for_v6.18_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  EDAC/altera: Use INTTEST register for Ethernet and USB SBE injection
  EDAC/altera: Handle OCRAM ECC enable after warm reset
  EDAC/versalnet: Handle split messages for non-standard errors
---

87751e715e23ede7386fb57a1a8593aa9830b21f