Skip to contentSkip to conversation

RAS updates for 4.21

GIT PULL Merged Borislav Petkov 2 participants 2 messages Dec 23, 2018 – Dec 26, 2018

lore
Share & tools
lore
#0 lore raw

Hi Linus,

please pull the latest ras-core-for-linus tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git ras-core-for-linus

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.

Thanks,
Boris.

------------------>

The following changes since commit 2595646791c319cadfdbf271563aac97d0843dc7:

Linux 4.20-rc5 (2018-12-02 15:07:55 -0800)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git ras-core-for-linus

for you to fetch changes up to 72a8f089c382c078f8c7c1c759cb726de80d4284:

x86/mce: Restore MCE injector's module name (2018-12-19 00:04:36 +0100)

----------------------------------------------------------------
Borislav Petkov (3):
x86/mce: Streamline MCE subsystem's naming
x86/mce: Unify pr_* prefix
x86/mce: Restore MCE injector's module name

 arch/x86/kernel/cpu/Makefile                                  |  2 +-
 arch/x86/kernel/cpu/{mcheck => mce}/Makefile                  | 10 ++++++----
 arch/x86/kernel/cpu/{mcheck/mce_amd.c => mce/amd.c}           |  2 +-
 arch/x86/kernel/cpu/{mcheck/mce-apei.c => mce/apei.c}         |  2 +-
 arch/x86/kernel/cpu/{mcheck/mce.c => mce/core.c}              |  4 +---
 arch/x86/kernel/cpu/{mcheck => mce}/dev-mcelog.c              |  4 +---
 arch/x86/kernel/cpu/{mcheck/mce-genpool.c => mce/genpool.c}   |  2 +-
 arch/x86/kernel/cpu/{mcheck/mce-inject.c => mce/inject.c}     |  2 +-
 arch/x86/kernel/cpu/{mcheck/mce_intel.c => mce/intel.c}       |  2 +-
 arch/x86/kernel/cpu/{mcheck/mce-internal.h => mce/internal.h} |  3 +++
 arch/x86/kernel/cpu/{mcheck => mce}/p5.c                      |  2 ++
 arch/x86/kernel/cpu/{mcheck/mce-severity.c => mce/severity.c} |  2 +-
 arch/x86/kernel/cpu/{mcheck => mce}/therm_throt.c             |  2 ++
 arch/x86/kernel/cpu/{mcheck => mce}/threshold.c               |  2 ++
 arch/x86/kernel/cpu/{mcheck => mce}/winchip.c                 |  2 ++
 15 files changed, 26 insertions(+), 17 deletions(-)
 rename arch/x86/kernel/cpu/{mcheck => mce}/Makefile (61%)
 rename arch/x86/kernel/cpu/{mcheck/mce_amd.c => mce/amd.c} (99%)
 rename arch/x86/kernel/cpu/{mcheck/mce-apei.c => mce/apei.c} (99%)
 rename arch/x86/kernel/cpu/{mcheck/mce.c => mce/core.c} (99%)
 rename arch/x86/kernel/cpu/{mcheck => mce}/dev-mcelog.c (99%)
 rename arch/x86/kernel/cpu/{mcheck/mce-genpool.c => mce/genpool.c} (99%)
 rename arch/x86/kernel/cpu/{mcheck/mce-inject.c => mce/inject.c} (99%)
 rename arch/x86/kernel/cpu/{mcheck/mce_intel.c => mce/intel.c} (99%)
 rename arch/x86/kernel/cpu/{mcheck/mce-internal.h => mce/internal.h} (98%)
 rename arch/x86/kernel/cpu/{mcheck => mce}/p5.c (98%)
 rename arch/x86/kernel/cpu/{mcheck/mce-severity.c => mce/severity.c} (99%)
 rename arch/x86/kernel/cpu/{mcheck => mce}/therm_throt.c (99%)
 rename arch/x86/kernel/cpu/{mcheck => mce}/threshold.c (96%)
 rename arch/x86/kernel/cpu/{mcheck => mce}/winchip.c (97%)
Signature · 4 lines
Regards/Gruss,
    Boris.

SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg)
merge bot Merged
#1 lore raw
The pull request you sent on Sun, 23 Dec 2018 13:53:39 +0100:

The pull request you sent on Sun, 23 Dec 2018 13:53:39 +0100:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git ras-core-for-linus

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/eed9688f8513189295887e5a27ec7f576754b60e

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker