From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 25 Apr 2023 16:56:33 +0000 (-0700)
Subject: Merge tag 'ras_core_for_v6.4_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: ceph-for-6.4-rc3~216
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d3464152e541b08fdc3c60664c01a28f8844a655;p=ceph-client.git

Merge tag 'ras_core_for_v6.4_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull RAS updates from Borislav Petkov:

 - Just cleanups and fixes this time around: make threshold_ktype const,
   an objtool fix and use proper size for a bitmap

* tag 'ras_core_for_v6.4_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/MCE/AMD: Use an u64 for bank_map
  x86/mce: Always inline old MCA stubs
  x86/MCE/AMD: Make kobj_type structure constant
---

d3464152e541b08fdc3c60664c01a28f8844a655