Merge branch 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Browse source

Pull RAS fixes from Ingo Molnar:
 "A boot parameter fix, plus a header export fix"

* 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mce: Hide mca_cfg
  RAS/CEC: Use the right length for "cec_disable"

...

This commit is contained in:

Linus Torvalds 2017-10-14 15:19:11 -04:00

parent 26c923ab19 262e681183

commit 7b764cedcb

4 changed files with 10 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

arch/x86/include/asm/mce.h

View file

7

arch/x86/kernel/cpu/mcheck/mce-internal.h

View file

2

arch/x86/kernel/cpu/mcheck/mce_amd.c

View file

2

drivers/ras/cec.c

View file