From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 20 Feb 2022 20:04:14 +0000 (-0800)
Subject: Merge tag 'edac_urgent_for_v5.17_rc5' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: baikal/aarch64/sdk6.1~4625
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=2994984d4371d5707b396cecfd8cfa6cbeb610f0;p=kernel.git

Merge tag 'edac_urgent_for_v5.17_rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras

Pull EDAC fix from Borislav Petkov:
 "Fix a long-standing struct alignment bug in the EDAC struct allocation
  code"

* tag 'edac_urgent_for_v5.17_rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  EDAC: Fix calculation of returned address and next offset in edac_align_ptr()
---

2994984d4371d5707b396cecfd8cfa6cbeb610f0