OSDN Git Service

Merge branch 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Dec 2018 21:03:47 +0000 (13:03 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Dec 2018 21:03:47 +0000 (13:03 -0800)
commiteed9688f8513189295887e5a27ec7f576754b60e
treec205a6fa6b8ee8a5a99179a0d42e40e4a713c450
parent72af84151fa7e98720a0482b59de2d90ec7f10a7
parent72a8f089c382c078f8c7c1c759cb726de80d4284
Merge branch 'ras-core-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 RAS updates from Borislav Petkov:
 "This time around we have a subsystem reorganization to offer, with the
  new directory being

    arch/x86/kernel/cpu/mce/

  and all compilation units' names streamlined under it"

* 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mce: Restore MCE injector's module name
  x86/mce: Unify pr_* prefix
  x86/mce: Streamline MCE subsystem's naming
arch/x86/kernel/cpu/Makefile