From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 8 Mar 2016 17:29:00 +0000 (-0800)
Subject: Merge tag 'edac_fix_for_4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
X-Git-Tag: v5.15~14098
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=1e2a4c7a3f916f1caa5e68a9f2f7e6a04a0efa7e;p=mirror_ubuntu-kernels.git

Merge tag 'edac_fix_for_4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

Pull EDAC fix from Borislav Petkov:
 "Last minute fix for sb_edac which fixes DIMM detection on certain Xeon
  Phi configurations:

  A single fix to the Xeon Phi section of sb_edac.  The issue was
  introduced during this merge window"

* tag 'edac_fix_for_4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC, sb_edac: Fix logic when computing DIMM sizes on Xeon Phi
---

1e2a4c7a3f916f1caa5e68a9f2f7e6a04a0efa7e