From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 15 Jan 2023 13:12:58 +0000 (-0600)
Subject: Merge tag 'edac_urgent_for_v6.2_rc4' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v6.2-rc4~2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8aa9761223af6a075f9904d035b57cef9b26aaab;p=tomoyo%2Ftomoyo-test1.git

Merge tag 'edac_urgent_for_v6.2_rc4' of git://git./linux/kernel/git/ras/ras

Pull EDAC fixes from Borislav Petkov:

 - Fix the EDAC device's confusion in the polling setting units

 - Fix a memory leak in highbank's probing function

* tag 'edac_urgent_for_v6.2_rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  EDAC/highbank: Fix memory leak in highbank_mc_probe()
  EDAC/device: Fix period calculation in edac_device_reset_delay_period()
---

8aa9761223af6a075f9904d035b57cef9b26aaab