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

Browse source

Pull RAS updates from Ingo Molnar:
 "The biggest change in this cycle was an enhancement by Yazen Ghannam
  to reduce the number of MCE error injection related IPIs.

  The rest are smaller fixes"

* 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mce: Fix mce_rdmsrl() warning message
  x86/RAS/AMD: Reduce the number of IPIs when prepping error injection
  x86/mce/AMD: Increase size of the bank_map type
  x86/mce: Do not use bank 1 for APEI generated error logs

...

This commit is contained in:

Linus Torvalds 2016-07-25 13:13:19 -07:00

parent c86ad14d30 38c54ccb2d

commit 89e7eb098a

4 changed files with 31 additions and 33 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

2

arch/x86/kernel/cpu/mcheck/mce-apei.c

View file

2

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

View file

2

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

View file

58

arch/x86/ras/mce_amd_inj.c

View file