diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-13 13:33:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-13 13:33:39 -0800 |
| commit | f2be8bd52e7410c70145f73511a2e80f4797e1a5 (patch) | |
| tree | cf6b98ff857e096ed30b8a35e21cdafe1045452d /kernel/watchdog.c | |
| parent | 31486372a1e9a66ec2e9e2903b8792bba7e503e1 (diff) | |
| parent | 783ca517bfd62ca516178712775e4b273292d5b1 (diff) | |
| download | linux-f2be8bd52e7410c70145f73511a2e80f4797e1a5.tar.bz2 | |
Merge branch 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull RAS updates from Ingo Molnar:
"Two minor updates to AMD SMCA support, plus a timer_setup() conversion"
* 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/MCE/AMD: Fix mce_severity_amd_smca() signature
x86/MCE/AMD: Always give panic severity for UC errors in kernel context
x86/mce: Convert timers to use timer_setup()
Diffstat (limited to 'kernel/watchdog.c')
0 files changed, 0 insertions, 0 deletions