Merge tag 'edac_urgent_for_v6.2_rc4' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 15 Jan 2023 13:12:58 +0000 (07:12 -0600)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 15 Jan 2023 13:12:58 +0000 (07:12 -0600)
commit8aa9761223af6a075f9904d035b57cef9b26aaab
tree77ea7309c54f97458148d5af654a262799a7937d
parentb1d63f0c777b6df1ab53c5597d5fc25753f52f07
parente7a293658c20a7945014570e1921bf7d25d68a36
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()