From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 5 May 2024 17:51:29 +0000 (-0700)
Subject: Merge tag 'edac_urgent_for_v6.9_rc7' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v6.9-rc7~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f462ae0edd3703edd6f22fe41d336369c38b884b;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'edac_urgent_for_v6.9_rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras

Pull EDAC fixes from Borislav Petkov:

 - Fix error logging and check user-supplied data when injecting an
   error in the versal EDAC driver

* tag 'edac_urgent_for_v6.9_rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  EDAC/versal: Do not log total error counts
  EDAC/versal: Check user-supplied data before injecting an error
  EDAC/versal: Do not register for NOC errors
---

f462ae0edd3703edd6f22fe41d336369c38b884b